Merge "EncodeImageInternal: fix uninitialized free"

This commit is contained in:
pascal massimino 2012-10-03 14:53:35 -07:00 committed by Gerrit Code Review
commit ab5b67a1d0

View File

@ -530,7 +530,12 @@ static int EncodeImageInternal(VP8LBitWriter* const bw,
sizeof(*histogram_symbols)); sizeof(*histogram_symbols));
assert(histogram_bits >= MIN_HUFFMAN_BITS); assert(histogram_bits >= MIN_HUFFMAN_BITS);
assert(histogram_bits <= MAX_HUFFMAN_BITS); assert(histogram_bits <= MAX_HUFFMAN_BITS);
if (histogram_image == NULL || histogram_symbols == NULL) goto Error;
if (histogram_image == NULL || histogram_symbols == NULL) {
free(histogram_image);
free(histogram_symbols);
return 0;
}
// Calculate backward references from ARGB image. // Calculate backward references from ARGB image.
if (!VP8LGetBackwardReferences(width, height, argb, quality, cache_bits, if (!VP8LGetBackwardReferences(width, height, argb, quality, cache_bits,