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

libwebp: fix vp8 encoder mem alloc offsetting

Browse Source 
'mem' was being offset once by DO_ALIGN() then shifted 'nz_size' which
would end up accounting for more than ALIGN_CST and exceed the allocation.

broken since:
  9bf3129 align VP8Encoder::nz_ allocation

Change-Id: I04a4e0bbf80d909253ce057f8550ed98e0cf1054
This commit is contained in:
James Zern 2013-05-15 07:21:34 +00:00
parent 87a4fca25f
commit d8edd83551
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/enc/webpenc.c
View File

@ -243,8 +243,7 @@ static VP8Encoder* InitVP8Encoder(const WebPConfig* const config,
mem += info_size;
enc->preds_ = ((uint8_t*)mem) + 1 + enc->preds_w_;
mem += preds_w * preds_h * sizeof(uint8_t);
mem = (uint8_t*)DO_ALIGN(mem);
enc->nz_ = 1 + (uint32_t*)mem;
enc->nz_ = 1 + (uint32_t*)DO_ALIGN(mem);
mem += nz_size;
enc->lf_stats_ = lf_stats_size ? (LFStats*)DO_ALIGN(mem) : NULL;
mem += lf_stats_size;
@ -261,6 +260,7 @@ static VP8Encoder* InitVP8Encoder(const WebPConfig* const config,
mem += 16;
enc->v_left_ = (uint8_t*)mem;
mem += 8;
assert(mem <= (uint8_t*)enc + size);
enc->config_ = config;
enc->profile_ = use_filter ? ((config->filter_type == 1) ? 0 : 1) : 2;