CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-13 16:01:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use malloc

Browse Source
This commit is contained in:
twinaphex 2017-09-29 22:47:45 +02:00
parent 57ded65189
commit 7959cd3993
1 changed files with 69 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
libretro-common/formats/png/rpng.c
View File

@ -92,28 +92,27 @@ struct rpng_process
bool inflate_initialized; bool inflate_initialized;
bool adam7_pass_initialized; bool adam7_pass_initialized;
bool pass_initialized; bool pass_initialized;
uint32_t *data;
uint32_t *palette;
struct png_ihdr ihdr;
uint8_t *prev_scanline; uint8_t *prev_scanline;
uint8_t *decoded_scanline; uint8_t *decoded_scanline;
uint8_t *inflate_buf; uint8_t *inflate_buf;
struct png_ihdr ihdr;
size_t restore_buf_size; size_t restore_buf_size;
size_t adam7_restore_buf_size; size_t adam7_restore_buf_size;
size_t data_restore_buf_size; size_t data_restore_buf_size;
size_t inflate_buf_size; size_t inflate_buf_size;
size_t avail_in;
size_t avail_out;
size_t total_out;
size_t pass_size;
unsigned bpp; unsigned bpp;
unsigned pitch; unsigned pitch;
unsigned h; unsigned h;
struct unsigned pass_width;
{ unsigned pass_height;
unsigned width; unsigned pass_pos;
unsigned height; uint32_t *data;
size_t size; uint32_t *palette;
unsigned pos;
} pass;
void *stream; void *stream;
size_t avail_in, avail_out, total_out;
const struct trans_stream_backend *stream_backend; const struct trans_stream_backend *stream_backend;
}; };
@ -518,29 +517,29 @@ static int png_reverse_filter_init(const struct png_ihdr *ihdr,
if (!pngp->adam7_pass_initialized && ihdr->interlace) if (!pngp->adam7_pass_initialized && ihdr->interlace)
{ {
if (ihdr->width <= passes[pngp->pass.pos].x || if (ihdr->width <= passes[pngp->pass_pos].x ||
ihdr->height <= passes[pngp->pass.pos].y) /* Empty pass */ ihdr->height <= passes[pngp->pass_pos].y) /* Empty pass */
return 1; return 1;
pngp->pass.width = (ihdr->width - pngp->pass_width = (ihdr->width -
passes[pngp->pass.pos].x + passes[pngp->pass.pos].stride_x - 1) / passes[pngp->pass.pos].stride_x; passes[pngp->pass_pos].x + passes[pngp->pass_pos].stride_x - 1) / passes[pngp->pass_pos].stride_x;
pngp->pass.height = (ihdr->height - passes[pngp->pass.pos].y + pngp->pass_height = (ihdr->height - passes[pngp->pass_pos].y +
passes[pngp->pass.pos].stride_y - 1) / passes[pngp->pass.pos].stride_y; passes[pngp->pass_pos].stride_y - 1) / passes[pngp->pass_pos].stride_y;
pngp->data = (uint32_t*)malloc( pngp->data = (uint32_t*)malloc(
pngp->pass.width * pngp->pass.height * sizeof(uint32_t)); pngp->pass_width * pngp->pass_height * sizeof(uint32_t));
if (!pngp->data) if (!pngp->data)
return -1; return -1;
pngp->ihdr = *ihdr; pngp->ihdr = *ihdr;
pngp->ihdr.width = pngp->pass.width; pngp->ihdr.width = pngp->pass_width;
pngp->ihdr.height = pngp->pass.height; pngp->ihdr.height = pngp->pass_height;
png_pass_geom(&pngp->ihdr, pngp->pass.width, png_pass_geom(&pngp->ihdr, pngp->pass_width,
pngp->pass.height, NULL, NULL, &pngp->pass.size); pngp->pass_height, NULL, NULL, &pngp->pass_size);
if (pngp->pass.size > pngp->total_out) if (pngp->pass_size > pngp->total_out)
{ {
free(pngp->data); free(pngp->data);
return -1; return -1;
@ -561,8 +560,8 @@ static int png_reverse_filter_init(const struct png_ihdr *ihdr,
pngp->restore_buf_size = 0; pngp->restore_buf_size = 0;
pngp->data_restore_buf_size = 0; pngp->data_restore_buf_size = 0;
pngp->prev_scanline = (uint8_t*)calloc(1, pngp->pitch); pngp->prev_scanline = (uint8_t*)calloc(1, pngp->pitch);
pngp->decoded_scanline = (uint8_t*)calloc(1, pngp->pitch); pngp->decoded_scanline = (uint8_t*)calloc(1, pngp->pitch);
if (!pngp->prev_scanline || !pngp->decoded_scanline) if (!pngp->prev_scanline || !pngp->decoded_scanline)
goto error; goto error;
@ -686,7 +685,7 @@ static int png_reverse_filter_adam7_iterate(uint32_t **data_,
struct rpng_process *pngp) struct rpng_process *pngp)
{ {
int ret = 0; int ret = 0;
bool to_next = pngp->pass.pos < ARRAY_SIZE(passes); bool to_next = pngp->pass_pos < ARRAY_SIZE(passes);
uint32_t *data = *data_; uint32_t *data = *data_;
if (!to_next) if (!to_next)
@ -710,19 +709,19 @@ static int png_reverse_filter_adam7_iterate(uint32_t **data_,
if (ret == IMAGE_PROCESS_ERROR || ret == IMAGE_PROCESS_ERROR_END) if (ret == IMAGE_PROCESS_ERROR || ret == IMAGE_PROCESS_ERROR_END)
return IMAGE_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
pngp->inflate_buf += pngp->pass.size; pngp->inflate_buf += pngp->pass_size;
pngp->adam7_restore_buf_size += pngp->pass.size; pngp->adam7_restore_buf_size += pngp->pass_size;
pngp->total_out -= pngp->pass.size; pngp->total_out -= pngp->pass_size;
png_reverse_filter_adam7_deinterlace_pass(data, png_reverse_filter_adam7_deinterlace_pass(data,
ihdr, pngp->data, pngp->pass.width, pngp->pass.height, &passes[pngp->pass.pos]); ihdr, pngp->data, pngp->pass_width, pngp->pass_height, &passes[pngp->pass_pos]);
free(pngp->data); free(pngp->data);
pngp->pass.width = 0; pngp->pass_width = 0;
pngp->pass.height = 0; pngp->pass_height = 0;
pngp->pass.size = 0; pngp->pass_size = 0;
pngp->adam7_pass_initialized = false; pngp->adam7_pass_initialized = false;
return IMAGE_PROCESS_NEXT; return IMAGE_PROCESS_NEXT;
@ -741,7 +740,7 @@ static int png_reverse_filter_adam7(uint32_t **data_,
case IMAGE_PROCESS_END: case IMAGE_PROCESS_END:
break; break;
case IMAGE_PROCESS_NEXT: case IMAGE_PROCESS_NEXT:
pngp->pass.pos++; pngp->pass_pos++;
return 0; return 0;
case IMAGE_PROCESS_ERROR: case IMAGE_PROCESS_ERROR:
if (pngp->data) if (pngp->data)
@ -751,8 +750,8 @@ static int png_reverse_filter_adam7(uint32_t **data_,
return -1; return -1;
} }
pngp->inflate_buf -= pngp->adam7_restore_buf_size; pngp->inflate_buf -= pngp->adam7_restore_buf_size;
pngp->adam7_restore_buf_size = 0; pngp->adam7_restore_buf_size = 0;
return ret; return ret;
} }
@ -868,11 +867,44 @@ bool png_realloc_idat(const struct png_chunk *chunk, struct idat_buffer *buf)
static struct rpng_process *rpng_process_init(rpng_t *rpng, unsigned *width, unsigned *height) static struct rpng_process *rpng_process_init(rpng_t *rpng, unsigned *width, unsigned *height)
{ {
uint8_t *inflate_buf = NULL; uint8_t *inflate_buf = NULL;
struct rpng_process *process = (struct rpng_process*)calloc(1, sizeof(*process)); struct rpng_process *process = (struct rpng_process*)malloc(sizeof(*process));
if (!process) if (!process)
return NULL; return NULL;
process->inflate_initialized = false;
process->adam7_pass_initialized = false;
process->pass_initialized = false;
process->prev_scanline = NULL;
process->decoded_scanline = NULL;
process->inflate_buf = NULL;
process->ihdr.width = 0;
process->ihdr.height = 0;
process->ihdr.depth = 0;
process->ihdr.color_type = 0;
process->ihdr.compression = 0;
process->ihdr.filter = 0;
process->ihdr.interlace = 0;
process->restore_buf_size = 0;
process->restore_buf_size = 0;
process->adam7_restore_buf_size = 0;
process->data_restore_buf_size = 0;
process->inflate_buf_size = 0;
process->avail_in = 0;
process->avail_out = 0;
process->total_out = 0;
process->pass_size = 0;
process->bpp = 0;
process->pitch = 0;
process->h = 0;
process->pass_width = 0;
process->pass_height = 0;
process->pass_pos = 0;
process->data = NULL;
process->palette = NULL;
process->stream = NULL;
process->stream_backend = trans_stream_get_zlib_inflate_backend(); process->stream_backend = trans_stream_get_zlib_inflate_backend();
png_pass_geom(&rpng->ihdr, rpng->ihdr.width, png_pass_geom(&rpng->ihdr, rpng->ihdr.width,