KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl/blob: Return false from grow_to_fit if we've ever failed 

Otherwise we could have a failure followed by a smaller write that
succeeds and get a corrupted blob.  If we ever OOM, we should stop.

v2 (Jason Ekstrand):
 - Initialize the new boolean member in create_blob

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Cc: mesa-stable@lists.freedesktop.org
This commit is contained in:
Jason Ekstrand 2017-10-11 13:32:45 -07:00
parent 7118851374
commit e03717efbd
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/glsl/blob.c
View File

@ -46,6 +46,9 @@ grow_to_fit(struct blob *blob, size_t additional)
size_t to_allocate;
uint8_t *new_data;
if (blob->out_of_memory)
return false;
if (blob->size + additional <= blob->allocated)
return true;
@ -57,8 +60,10 @@ grow_to_fit(struct blob *blob, size_t additional)
to_allocate = MAX2(to_allocate, blob->allocated + additional);
new_data = realloc(blob->data, to_allocate);
if (new_data == NULL)
if (new_data == NULL) {
blob->out_of_memory = true;
return false;
}
blob->data = new_data;
blob->allocated = to_allocate;
@ -104,6 +109,7 @@ blob_create()
blob->data = NULL;
blob->allocated = 0;
blob->size = 0;
blob->out_of_memory = false;
return blob;
}

6
src/compiler/glsl/blob.h
View File

@ -55,6 +55,12 @@ struct blob {
/** The number of bytes that have actual data written to them. */
size_t size;
/**
* True if we've ever failed to realloc or if we go pas the end of a fixed
* allocation blob.
*/
bool out_of_memory;
};
/* When done reading, the caller can ensure that everything was consumed by