diff options
| author | James Zern <jzern@google.com> | 2023-02-28 00:22:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-02-28 00:22:57 +0000 |
| commit | 0e12a22d885e0454ad0be97b0babd2b7f4939fc6 (patch) | |
| tree | 1cb7e68318288af453e0437e3443b89db4151aad | |
| parent | 41ffe04e1245250136792e441d22aabda5cce1b6 (diff) | |
| parent | a486d800b60d0af4cc0836bf7ed8f21e12974129 (diff) | |
| download | libwebp-0e12a22d885e0454ad0be97b0babd2b7f4939fc6.tar.gz | |
Merge "EncodeAlphaInternal: clear result->bw on error" into main
| -rw-r--r-- | src/enc/alpha_enc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c index f7c02690..7d205586 100644 --- a/src/enc/alpha_enc.c +++ b/src/enc/alpha_enc.c @@ -13,6 +13,7 @@ #include <assert.h> #include <stdlib.h> +#include <string.h> #include "src/enc/vp8i_enc.h" #include "src/dsp/dsp.h" @@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, } } else { VP8LBitWriterWipeOut(&tmp_bw); + memset(&result->bw, 0, sizeof(result->bw)); return 0; } } @@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, int width, int height, header = method | (filter << 2); if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4; - VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size); + if (!VP8BitWriterInit(&result->bw, ALPHA_HEADER_LEN + output_size)) ok = 0; ok = ok && VP8BitWriterAppend(&result->bw, &header, ALPHA_HEADER_LEN); ok = ok && VP8BitWriterAppend(&result->bw, output, output_size); |