generic-library/webp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memory leak in method EncodeImageInternal for histogram_image.

Browse Source 
Change-Id: Ia1cfb96d9e6c120630732e2b5f39688376d1d208
This commit is contained in:
Vikas Arora 2012-04-13 07:18:09 +00:00 committed by James Zern
parent 352a4f49ab
commit 36dabdadf8
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/enc/vp8l.c
View File

@ -215,11 +215,12 @@ static int GetBackwardReferences(int width, int height,
// Choose appropriate backward reference. // Choose appropriate backward reference.
if (quality >= 50 && lz77_is_useful) { if (quality >= 50 && lz77_is_useful) {
const int recursion_level = (num_pix < 320 * 200) ? 1 : 0; const int recursion_level = (num_pix < 320 * 200) ? 1 : 0;
PixOrCopy* const backward_refs_trace =
(PixOrCopy*)malloc(num_pix * sizeof(*backward_refs_trace));
int backward_refs_trace_size; int backward_refs_trace_size;
PixOrCopy* backward_refs_trace;
free(backward_refs_rle); free(backward_refs_rle);
free(backward_refs_lz77); free(backward_refs_lz77);
backward_refs_trace =
(PixOrCopy*)malloc(num_pix * sizeof(*backward_refs_trace));
if (backward_refs_trace == NULL || if (backward_refs_trace == NULL ||
!VP8LBackwardReferencesTraceBackwards(width, height, !VP8LBackwardReferencesTraceBackwards(width, height,
recursion_level, use_color_cache, recursion_level, use_color_cache,
@ -259,7 +260,7 @@ End:
return ok; return ok;
} }
static void DeleteHistograms(int size, VP8LHistogram** histograms) { static void DeleteHistograms(VP8LHistogram** histograms, int size) {
if (histograms != NULL) { if (histograms != NULL) {
int i; int i;
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
@ -283,7 +284,7 @@ static int GetHistImageSymbols(int xsize, int ysize,
int histogram_image_raw_size; int histogram_image_raw_size;
VP8LHistogram** histogram_image_raw = NULL; VP8LHistogram** histogram_image_raw = NULL;
*histogram_image = 0; *histogram_image = NULL;
if (!VP8LHistogramBuildImage(xsize, ysize, histogram_bits, cache_bits, if (!VP8LHistogramBuildImage(xsize, ysize, histogram_bits, cache_bits,
backward_refs, backward_refs_size, backward_refs, backward_refs_size,
&histogram_image_raw, &histogram_image_raw,
@ -306,9 +307,9 @@ static int GetHistImageSymbols(int xsize, int ysize,
Error: Error:
if (!ok) { if (!ok) {
DeleteHistograms(*histogram_image_size, *histogram_image); DeleteHistograms(*histogram_image, *histogram_image_size);
} }
DeleteHistograms(histogram_image_raw_size, histogram_image_raw); DeleteHistograms(histogram_image_raw, histogram_image_raw_size);
return ok; return ok;
} }
@ -419,6 +420,7 @@ static int OptimizeHuffmanForRle(int length, int* counts) {
return 1; return 1;
} }
// TODO(vikasa): Wrap bit_codes and bit_lengths in a Struct.
static int GetHuffBitLengthsAndCodes( static int GetHuffBitLengthsAndCodes(
int histogram_image_size, VP8LHistogram** histogram_image, int histogram_image_size, VP8LHistogram** histogram_image,
int use_color_cache, int** bit_length_sizes, int use_color_cache, int** bit_length_sizes,
@ -428,6 +430,7 @@ static int GetHuffBitLengthsAndCodes(
for (i = 0; i < histogram_image_size; ++i) { for (i = 0; i < histogram_image_size; ++i) {
const int num_literals = VP8LHistogramNumCodes(histogram_image[i]); const int num_literals = VP8LHistogramNumCodes(histogram_image[i]);
k = 0; k = 0;
// TODO(vikasa): Alloc one big buffer instead of allocating in the loop.
(*bit_length_sizes)[5 * i] = num_literals; (*bit_length_sizes)[5 * i] = num_literals;
(*bit_lengths)[5 * i] = (uint8_t*)calloc(num_literals, 1); (*bit_lengths)[5 * i] = (uint8_t*)calloc(num_literals, 1);
(*bit_codes)[5 * i] = (uint16_t*) (*bit_codes)[5 * i] = (uint16_t*)
@ -832,7 +835,8 @@ static int EncodeImageInternal(VP8LBitWriter* const bw,
} }
// Free combined histograms. // Free combined histograms.
DeleteHistograms(histogram_image_size, histogram_image); DeleteHistograms(histogram_image, histogram_image_size);
histogram_image = NULL;
// Emit no bits if there is only one symbol in the histogram. // Emit no bits if there is only one symbol in the histogram.
// This gives better compression for some images. // This gives better compression for some images.
@ -847,6 +851,9 @@ static int EncodeImageInternal(VP8LBitWriter* const bw,
ok = 1; ok = 1;
Error: Error:
if (!ok) {
DeleteHistograms(histogram_image, histogram_image_size);
}
for (i = 0; i < 5 * histogram_image_size; ++i) { for (i = 0; i < 5 * histogram_image_size; ++i) {
free(bit_lengths[i]); free(bit_lengths[i]);
free(bit_codes[i]); free(bit_codes[i]);