diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2013-12-04 16:53:17 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-12-05 20:36:54 -0500 |
| commit | f51e3a1971045c7ed0c3d9d29d3254a4d940198e (patch) | |
| tree | 035df66c3942ac2a215603f2c1cebb4a5331ab05 /libavcodec/webp.c | |
| parent | b73a8922d818c7f909855557718d4c3bfacbd92d (diff) | |
webp: do not call av_frame_free() on the user-provided frame
Fixes double-free on error.
Diffstat (limited to 'libavcodec/webp.c')
| -rw-r--r-- | libavcodec/webp.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/webp.c b/libavcodec/webp.c index cf431fee2c..d531a78a39 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1129,10 +1129,8 @@ static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p, if (is_alpha_chunk) s->image[IMAGE_ROLE_ARGB].is_alpha_primary = 1; ret = decode_entropy_coded_image(s, IMAGE_ROLE_ARGB, w, h); - if (ret < 0) { - av_frame_free(&p); + if (ret < 0) goto free_and_return; - } /* apply transformations */ for (i = s->nb_transforms - 1; i >= 0; i--) { @@ -1150,10 +1148,8 @@ static int vp8_lossless_decode_frame(AVCodecContext *avctx, AVFrame *p, ret = apply_color_indexing_transform(s); break; } - if (ret < 0) { - av_frame_free(&p); + if (ret < 0) goto free_and_return; - } } *got_frame = 1; |