From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 772A64270E for ; Tue, 22 Mar 2022 23:47:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D3F768B007; Wed, 23 Mar 2022 01:47:44 +0200 (EET) Received: from mail-yb1-f180.google.com (mail-yb1-f180.google.com [209.85.219.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4391068A867 for ; Wed, 23 Mar 2022 01:47:38 +0200 (EET) Received: by mail-yb1-f180.google.com with SMTP id f38so36582948ybi.3 for ; Tue, 22 Mar 2022 16:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=GMvzY+izx1FBWDzZyJz3TcAo7rXhYcjjoGaK9rlOiz0=; b=mncOW9eqysdKMrOqoW6mvknkr6QRh6stDo6h46dIx/+zxKJdysNKOofF+Bo84woRuM hxsEu9usOye24DJd154CwckrRCTJ4/V4DXyVyVPTSYS7eNXy5I2YmN6wmWjVPxFki2A4 MSuGi548xeApMStZ8Gckfzp6/0JmLNK6J8RLcBECtPjfrWPebN55duzGtwPySqYuTRhZ 8nuX8GHuBOAvB70tW5BLNxdNRrYlBn347ek85O5ecj8RNArJuzwPiOh/oLWoupSfNpjZ YbggY/OrO2orof/VujB1OpuMAuWzZVc9bTIR+5iyZOJUl5LEGRA7CRq+5viCvNAIe2uB SCCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=GMvzY+izx1FBWDzZyJz3TcAo7rXhYcjjoGaK9rlOiz0=; b=e0I+2wbajNnK5K5YiCJYjB0qxdQPRbURofqGVXYUQ7/kpQoN4w+oRAVELTgwGrLdJy Gwq94M5rKeG8tvXzTGGLCwJA6lRQDzq3Zp+Sr0cgIZahOl5ZmxKCanqaSfwaxo945nL7 QNIGGQFLs3alkw/Su5DTMUoPo/fNMkfSCzVkkX7q3fOWxUksV9XauWJXtVqcsinLZhZJ +3t8L/y1LNltl6riL/GMPHBMcmwXjH1+NjtxjPAIdkdly+1+bVuqEHySHxUrK5NLjpRg CfTk8ncTIRGk68EwrkIFd4PeioMgAZcGSl4eW40+pOEIJwhbFYKENUFSGeFSPaJ8Exjb xzxw== X-Gm-Message-State: AOAM531Sq84j9MxakYfT8VsDhuMxiPXeB2P+voKV9UumE42n4NwgeQNE uOWjGg9FryCN2FIZPQ9OeVsxcEqWx6FIdhdkw3+cjPZCRu5OOA== X-Google-Smtp-Source: ABdhPJy7If1pyDbPlGPIX5e0tX8NrPTNVlCxdc3mzMqCAPizVHst7LU9BjMkYKWr4tgPVv+mHriTBtpnqhD8H1CXSZg= X-Received: by 2002:a25:81cd:0:b0:629:2e95:93e9 with SMTP id n13-20020a2581cd000000b006292e9593e9mr29804376ybm.321.1647992856449; Tue, 22 Mar 2022 16:47:36 -0700 (PDT) MIME-Version: 1.0 From: Andrey Volk Date: Wed, 23 Mar 2022 02:47:24 +0300 Message-ID: To: ffmpeg-devel@ffmpeg.org Content-Type: multipart/mixed; boundary="000000000000cd5d2705dad73cd5" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/libwebpenc_animencoder: Fix memory leak of WebPData in libwebp_anim_encode_frame() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000cd5d2705dad73cd5 Content-Type: text/plain; charset="UTF-8" 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) ``` --000000000000cd5d2705dad73cd5 Content-Type: message/rfc822; name="0001-avcodec-libwebpenc_animencoder-Fix-memory-leak-of-WebP.eml" Content-Disposition: attachment; filename="0001-avcodec-libwebpenc_animencoder-Fix-memory-leak-of-WebP.eml" Content-ID: X-Attachment-Id: f_l12sa34h0 From: Andrey Volk Date: Wed, 23 Mar 2022 02:28:49 +0300 Subject: [PATCH] avcodec/libwebpenc_animencoder: Fix memory leak of WebPData in libwebp_anim_encode_frame() X-Unsent: 1 To: ffmpeg-devel@ffmpeg.org Signed-off-by: Andrey Volk --- libavcodec/libwebpenc_animencoder.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); -- 2.33.0.windows.2 --000000000000cd5d2705dad73cd5 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". --000000000000cd5d2705dad73cd5--