dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

webpmux: ReadImage: fix ptr free in error case

Browse Source 
allocate to temporaries and deal with output pointers in one place to
reduce casting.

Change-Id: Ib12d866440184315536f35a15eb5adeba7879ae7
This commit is contained in:
James Zern 2011-12-02 16:00:51 -08:00
parent 721f3f48e7
commit 2f741d1e13
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/webpmux.c
View File

@ -390,17 +390,19 @@ static int ReadImage(const char* filename,
err = WebPMuxGetImage(mux, (const uint8_t**)&data, &size, err = WebPMuxGetImage(mux, (const uint8_t**)&data, &size,
&alpha_data, &alpha_size); &alpha_data, &alpha_size);
if (err == WEBP_MUX_OK) { if (err == WEBP_MUX_OK) {
uint8_t* const data_mem = (uint8_t*)malloc(size);
uint8_t* const alpha_mem = (uint8_t*)malloc(alpha_size);
if ((data_mem != NULL) && (alpha_mem != NULL)) {
memcpy(data_mem, data, size);
memcpy(alpha_mem, alpha_data, alpha_size);
*data_ptr = data_mem;
*size_ptr = size; *size_ptr = size;
*alpha_data_ptr = alpha_mem;
*alpha_size_ptr = alpha_size; *alpha_size_ptr = alpha_size;
*data_ptr = (uint8_t*)malloc(*size_ptr);
*alpha_data_ptr = (uint8_t*)malloc(*alpha_size_ptr);
if ((*data_ptr != NULL) && (*alpha_data_ptr != NULL)) {
memcpy((void*)*data_ptr, data, (size_t)size);
memcpy((void*)*alpha_data_ptr, alpha_data, (size_t)alpha_size);
ok = 1; ok = 1;
} else { } else {
free(data_ptr); free(data_mem);
free(alpha_data_ptr); free(alpha_mem);
err = WEBP_MUX_MEMORY_ERROR; err = WEBP_MUX_MEMORY_ERROR;
fprintf(stderr, "Failed to allocate %d bytes to extract image data from" fprintf(stderr, "Failed to allocate %d bytes to extract image data from"
" file %s. Error: %d\n", size + alpha_size, filename, err); " file %s. Error: %d\n", size + alpha_size, filename, err);