fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

disk_cache: Fix filename leak on error path.

Browse source 
Remove filename ralloc comment. filename is allocated by asprintf.

Clean up disk_cache_get dead code left over from 367ac07efc
("disk_cache: move cache item loading code into
disk_cache_load_item() helper").

Fix defect reported by Coverity Scan.
Logically dead code (DEADCODE)
dead_error_line: Execution cannot reach this statement:
free(filename);

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6738>
This commit is contained in:
Vinson Lee 2020-09-15 16:28:06 -07:00
parent 183ca88a91
commit 1b862716dd
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/util/disk_cache.c
View file

@ -372,15 +372,9 @@ disk_cache_get(struct disk_cache *cache, const cache_key key, size_t *size)
char *filename = disk_cache_get_cache_filename(cache, key);
if (filename == NULL)
goto fail;
return NULL;
return disk_cache_load_item(cache, filename, size);
fail:
if (filename)
free(filename);
return NULL;
}
void

5
src/util/disk_cache_os.c
View file

@ -616,6 +616,8 @@ disk_cache_load_item(struct disk_cache *cache, char *filename, size_t *size)
fail:
if (data)
free(data);
if (filename)
free(filename);
if (uncompressed_data)
free(uncompressed_data);
if (file_header)
@ -626,8 +628,7 @@ disk_cache_load_item(struct disk_cache *cache, char *filename, size_t *size)
return NULL;
}
/* Return a filename within the cache's directory corresponding to 'key'. The
* returned filename is ralloced with 'cache' as the parent context.
/* Return a filename within the cache's directory corresponding to 'key'.
*
* Returns NULL if out of memory.
*/