From: Mark Janes <mark.a.janes@intel.com>
Date: Tue, 3 May 2016 20:50:49 +0000 (-0700)
Subject: mesa/objectlabel: handle NULL src string
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0af8a7d50ce0fdb8063f7fadd3b78975a2136d87;p=mesa.git

mesa/objectlabel: handle NULL src string

This prevents a crash when a NULL src is passed with a non-NULL length.

fixes: dEQP-GLES31.functional.debug.object_labels.query_length_only
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95252

Signed-off-by: Mark Janes <mark.a.janes@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/mesa/main/objectlabel.c b/src/mesa/main/objectlabel.c
index b77cb5c4e36..5070b008792 100644
--- a/src/mesa/main/objectlabel.c
+++ b/src/mesa/main/objectlabel.c
@@ -104,13 +104,14 @@ copy_label(const GLchar *src, GLchar *dst, GLsizei *length, GLsizei bufSize)
     * will be returned in <length>."
     */
 
+   if (src)
+      labelLen = strlen(src);
+
    if (bufSize == 0) {
       if (length)
-         *length = strlen(src);
+         *length = labelLen;
       return;
    }
-   if (src)
-      labelLen = strlen(src);
 
    if (dst) {
       if (src) {