NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glsl/cache: correct asprintf error handling

Browse source 
From the manpage of asprintf:

   "If memory allocation wasn't possible, or some other error occurs,
    these functions will return -1, and the contents of strp are
    undefined."

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
This commit is contained in:
Nicolai Hähnle 2016-11-03 10:23:17 +01:00
parent 8ce7ef75f5
commit aef7eb4cac
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/compiler/glsl/cache.c
View file

@ -416,7 +416,8 @@ choose_random_file_matching(const char *dir_path,
return NULL;
}
asprintf(&filename, "%s/%s", dir_path, entry->d_name);
if (asprintf(&filename, "%s/%s", dir_path, entry->d_name) < 0)
filename = NULL;
closedir(dir);
@ -497,8 +498,7 @@ evict_random_item(struct program_cache *cache)
a = rand() % 16;
b = rand() % 16;
asprintf (&dir_path, "%s/%c%c", cache->path, hex[a], hex[b]);
if (dir_path == NULL)
if (asprintf(&dir_path, "%s/%c%c", cache->path, hex[a], hex[b]) < 0)
return;
size = unlink_random_file_from_directory(dir_path);