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,14 +104,15 @@ copy_label(const GLchar *src, GLchar *dst, GLsizei *length, GLsizei bufSize)
     * will be returned in <length>."
     */
 
-   if (bufSize == 0) {
-      if (length)
-         *length = strlen(src);
-      return;
-   }
    if (src)
       labelLen = strlen(src);
 
+   if (bufSize == 0) {
+      if (length)
+         *length = labelLen;
+      return;
+   }
+
    if (dst) {
       if (src) {
          if (bufSize <= labelLen)