diff options
| author | Mike Stroyan <mike@LunarG.com> | 2015-10-28 11:15:46 -0600 |
|---|---|---|
| committer | Mike Stroyan <mike@LunarG.com> | 2015-10-28 17:07:22 -0600 |
| commit | 9e9792ad3a2524bfb91a94b4ebaf316eb006719b (patch) | |
| tree | 7d0551feab32a0ff2bbbbb525c0980beb984cb7c | |
| parent | bb60b383a14170c5476c5ae12957ecf626236916 (diff) | |
| download | usermoji-9e9792ad3a2524bfb91a94b4ebaf316eb006719b.tar.xz | |
demos: fclose in cube and tri
Balance every fopen with fclose.
| -rw-r--r-- | demos/cube.c | 19 | ||||
| -rw-r--r-- | demos/tri.c | 1 |
2 files changed, 15 insertions, 5 deletions
diff --git a/demos/cube.c b/demos/cube.c index 97022999..71062663 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -965,21 +965,29 @@ bool loadTexture(const char *filename, uint8_t *rgba_data, return false; cPtr = fgets(header, 256, fPtr); // P6 - if (cPtr == NULL || strncmp(header, "P6\n", 3)) + if (cPtr == NULL || strncmp(header, "P6\n", 3)) { + fclose(fPtr); return false; + } do { cPtr = fgets(header, 256, fPtr); - if (cPtr == NULL) + if (cPtr == NULL) { + fclose(fPtr); return false; + } } while ( !strncmp(header, "#", 1) ); sscanf(header, "%u %u", height, width); - if (rgba_data == NULL) + if (rgba_data == NULL) { + fclose(fPtr); return true; + } fgets(header, 256, fPtr); // Format - if (cPtr == NULL || strncmp(header, "255\n", 3)) + if (cPtr == NULL || strncmp(header, "255\n", 3)) { + fclose(fPtr); return false; + } for(int y = 0; y < *height; y++) { @@ -993,7 +1001,7 @@ bool loadTexture(const char *filename, uint8_t *rgba_data, rgba_data += layout->rowPitch; } fclose(fPtr); - return true; + return true; } static void demo_prepare_texture_image(struct demo *demo, @@ -1457,6 +1465,7 @@ char *demo_read_spv(const char *filename, size_t *psize) *psize = size; + fclose(fp); return shader_code; } diff --git a/demos/tri.c b/demos/tri.c index 7d34649b..dd1f449b 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -1222,6 +1222,7 @@ char *demo_read_spv(const char *filename, size_t *psize) *psize = size; + fclose(fp); return shader_code; } |