dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-05 00:16:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove one malloc from TraceBackwards()

Browse Source 
Change-Id: I4f77c0240ca2ece86e8beab11d02c74277409921
This commit is contained in:
skal 2013-02-05 19:43:43 +01:00
parent 7c732e59f4
commit f3a44dcd83
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/enc/backward_references.c
View File

@ -597,33 +597,23 @@ Error:
return ok; return ok;
} }
static int TraceBackwards(const uint32_t* const dist_array, // We pack the path at the end of *dist_array and return
int dist_array_size, // a pointer to this part of the array. Example:
uint32_t** const chosen_path, // dist_array = [1x2xx3x2] => packed [1x2x1232], chosen_path = [1232]
int* const chosen_path_size) { static void TraceBackwards(uint32_t* const dist_array,
int i; int dist_array_size,
// Count how many. uint32_t** const chosen_path,
int count = 0; int* const chosen_path_size) {
for (i = dist_array_size - 1; i >= 0; ) { uint32_t* path = dist_array + dist_array_size;
int k = dist_array[i]; uint32_t* cur = dist_array + dist_array_size - 1;
assert(k >= 1); while (cur >= dist_array) {
++count; const int k = *cur;
i -= k; --path;
*path = k;
cur -= k;
} }
// Allocate. *chosen_path = path;
*chosen_path_size = count; *chosen_path_size = dist_array + dist_array_size - path;
*chosen_path =
(uint32_t*)WebPSafeMalloc((uint64_t)count, sizeof(**chosen_path));
if (*chosen_path == NULL) return 0;
// Write in reverse order.
for (i = dist_array_size - 1; i >= 0; ) {
int k = dist_array[i];
assert(k >= 1);
(*chosen_path)[--count] = k;
i -= k;
}
return 1;
} }
static int BackwardReferencesHashChainFollowChosenPath( static int BackwardReferencesHashChainFollowChosenPath(
@ -722,12 +712,7 @@ static int BackwardReferencesTraceBackwards(int xsize, int ysize,
dist_array)) { dist_array)) {
goto Error; goto Error;
} }
if (!TraceBackwards(dist_array, dist_array_size, TraceBackwards(dist_array, dist_array_size, &chosen_path, &chosen_path_size);
&chosen_path, &chosen_path_size)) {
goto Error;
}
free(dist_array); // no need to retain this memory any longer
dist_array = NULL;
if (!BackwardReferencesHashChainFollowChosenPath( if (!BackwardReferencesHashChainFollowChosenPath(
xsize, ysize, argb, quality, cache_bits, chosen_path, chosen_path_size, xsize, ysize, argb, quality, cache_bits, chosen_path, chosen_path_size,
refs)) { refs)) {
@ -735,7 +720,6 @@ static int BackwardReferencesTraceBackwards(int xsize, int ysize,
} }
ok = 1; ok = 1;
Error: Error:
free(chosen_path);
free(dist_array); free(dist_array);
return ok; return ok;
} }