mesa: Close fp on error path.
authorMatt Turner <mattst88@gmail.com>
Mon, 27 Jun 2016 23:31:09 +0000 (16:31 -0700)
committerMatt Turner <mattst88@gmail.com>
Thu, 30 Jun 2016 18:08:39 +0000 (11:08 -0700)
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/dlist.c

index 3845d2e12145e08b9dd60c5ed35656005e9dbe92..9d9e319bcee9689cc1fa8b50d49a0d5be89cd758 100644 (file)
@@ -10086,15 +10086,12 @@ print_list(struct gl_context *ctx, GLuint list, const char *fname)
 
    if (!islist(ctx, list)) {
       fprintf(f, "%u is not a display list ID\n", list);
-      return;
+      goto out;
    }
 
    dlist = _mesa_lookup_list(ctx, list);
    if (!dlist) {
-      if (fname) {
-         fclose(f);
-      }
-      return;
+      goto out;
    }
 
    n = dlist->Head;
@@ -10366,7 +10363,7 @@ print_list(struct gl_context *ctx, GLuint list, const char *fname)
                printf
                   ("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n",
                    opcode, (void *) n);
-               return;
+               goto out;
             }
             else {
                fprintf(f, "command %d, %u operands\n", opcode,
@@ -10380,6 +10377,7 @@ print_list(struct gl_context *ctx, GLuint list, const char *fname)
       }
    }
 
+ out:
    fflush(f);
    if (fname)
       fclose(f);