| Message ID | CAD55zR2GkQzBBWrcurmGAc8d3QSc_2vq6vniCKM+SeVs-sNUFg@mail.gmail.com |
|---|---|
| State | Accepted |
| Commit | 4e6debe1df7d53f3f59b37449b82265d5c08a172 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/libwebpenc_animencoder: Fix memory leak of WebPData in libwebp_anim_encode_frame() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/libwebpenc_animencoder.c b/libavcodec/libwebpenc_animencoder.c index 0f5b524335..29c0d8bb0f 100644 --- a/libavcodec/libwebpenc_animencoder.c +++ b/libavcodec/libwebpenc_animencoder.c @@ -70,14 +70,18 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt, ret = WebPAnimEncoderAssemble(s->enc, &assembled_data); if (ret) { ret = ff_get_encode_buffer(avctx, pkt, assembled_data.size, 0); - if (ret < 0) + if (ret < 0) { + WebPDataClear(&assembled_data); return ret; + } memcpy(pkt->data, assembled_data.bytes, assembled_data.size); + WebPDataClear(&assembled_data); s->done = 1; pkt->pts = pkt->dts = s->first_frame_pts; *got_packet = 1; return 0; } else { + WebPDataClear(&assembled_data); av_log(s, AV_LOG_ERROR, "WebPAnimEncoderAssemble() failed with error: %d\n", VP8_ENC_ERROR_OUT_OF_MEMORY);
A fix attached. ``` ==37349==ERROR: LeakSanitizer: detected memory leaks Direct leak of 153770 byte(s) in 1 object(s) allocated from: #0 0x7fa249785330 in __interceptor_malloc (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xe9330) #1 0x7fa245c41e59 in WebPMuxAssemble /libwebp-0.6.1/src/mux/muxedit.c:628 #2 0x7fa245c4103e in WebPAnimEncoderAssemble /libwebp-0.6.1/src/mux/anim_encode.c:1562 #3 0x7fa2485774f9 in libwebp_anim_encode_frame libavcodec/libwebpenc_animencoder.c:68 #4 0x7fa24833a6ac in encode_simple_internal libavcodec/encode.c:214 #5 0x7fa24833a6ac in encode_simple_receive_packet libavcodec/encode.c:275 #6 0x7fa24833a6ac in encode_receive_packet_internal libavcodec/encode.c:309 #7 0x7fa24833abf8 in avcodec_send_frame libavcodec/encode.c:387 #8 0x7fa24833af1c in compat_encode libavcodec/encode.c:439 #9 0x7fa24833b1a5 in avcodec_encode_video2 (/usr/local/ffmpeg/lib/x86_64-linux-gnu/libavcodec.so.58+0x2bb1a5) ``` Signed-off-by: Andrey Volk <andywolk@gmail.com> --- libavcodec/libwebpenc_animencoder.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)