glsl: Fix null access on file read error
authorJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Fri, 7 Feb 2014 12:43:59 +0000 (14:43 +0200)
committerBrian Paul <brianp@vmware.com>
Fri, 7 Feb 2014 15:14:04 +0000 (08:14 -0700)
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
src/glsl/main.cpp

index 5ea57d53a88c70de0bb434fa4e107586099c7a4d..3a0f812f237b60a1d0d109546428e65deca74895 100644 (file)
@@ -232,7 +232,7 @@ load_text_file(void *ctx, const char *file_name)
                        if (bytes < size - total_read) {
                                free(text);
                                text = NULL;
-                               break;
+                               goto error;
                        }
 
                        if (bytes == 0) {
@@ -243,6 +243,7 @@ load_text_file(void *ctx, const char *file_name)
                } while (total_read < size);
 
                text[total_read] = '\0';
+error:;
        }
 
        fclose(fp);