Mesa (master): mesa/objectlabel: handle NULL src string
Mark Janes
majanes at kemper.freedesktop.org
Tue May 3 21:07:55 UTC 2016
Module: Mesa
Branch: master
Commit: 0af8a7d50ce0fdb8063f7fadd3b78975a2136d87
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0af8a7d50ce0fdb8063f7fadd3b78975a2136d87
Author: Mark Janes <mark.a.janes at intel.com>
Date: Tue May 3 13:50:49 2016 -0700
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 at intel.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
---
src/mesa/main/objectlabel.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/objectlabel.c b/src/mesa/main/objectlabel.c
index b77cb5c..5070b00 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) {
More information about the mesa-commit
mailing list