From patchwork Mon Apr 26 17:15:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27432 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp281535iob; Mon, 26 Apr 2021 10:15:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/ZAmPODzkfLeWRbyLfWcTQ0P+XwQnnTXT1xB7kRlpNmWAg+8MNaS7jwNEXce8TB6KNLIG X-Received: by 2002:a17:906:9b15:: with SMTP id eo21mr20350800ejc.237.1619457333860; Mon, 26 Apr 2021 10:15:33 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d12si15305173ejj.422.2021.04.26.10.15.33; Mon, 26 Apr 2021 10:15:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=ftB+72Le; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB3AB689E9A; Mon, 26 Apr 2021 20:15:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070088.outbound.protection.outlook.com [40.92.70.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCF04680A68 for ; Mon, 26 Apr 2021 20:15:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cd0lZn425puPBbZJGd1soYielAzedlVdYP3bwUHnLNTtZPLmEZNUuBUvLlsahwtmgphidg2NBvkClEfUAaLYEZgN9M+7KzkA5fYjW3KtXNkny2hExSXRHdbw7Dh8/8S0vVJW075LvKJ6B6j+gttzOf6ZZkoduCThDibR5n85e+YD9BIB0LQzHKpgx0wfuwW5ze5opds0heRAr8Ux621PT5QOdZO/GbC/lU2wOfp570Cka+NFjRYdIgbsIM3bRg4xQhI+IkU+Tqo+UvrFMLoVCyvAsQ+lilpFS/mNsKhHFhnkGtnLcggA6PeLgylJN31hW5mr+BrMKuuwPRvJSkvBgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SamJwj553hBO+Cox/mF0BOwFitibhfnsJSLe2zy+gj8=; b=RCZzDn/w9XaAwNva1GkyGOE56yLqWH5b0QWcbnGFdFlEzxQArYE3U18IDEHuVwCisYysFoQ4kZ/IgD+Vd7nYYTAV+AQsZ8NLEL/xf8EOKHdYBZpvIomKV6M5uTkBcUjce+mlivI/wbSMwBDdCN2+AIwt+diWAR3unxaW43MIkT4fIQ30FPBIAzin0j8/KG38hHdLfeXL8xOTqQJPPAEipvbr/86Mfm1y43DzXes7+VelWGDeP/4Z5theegqZ8HqLnWDRgZDHdMBOqh7zKYkwWLGaId9RSQjkvurzwq0kXV/hFotrAmP6u6I7CF7xqA5zsVuS6JPH8M07Y9Jhtc6hjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SamJwj553hBO+Cox/mF0BOwFitibhfnsJSLe2zy+gj8=; b=ftB+72LeSxynl+n6ianxTRH7eqKWDhMLtR4BMOiOS/NT5KDrVlX8pbNKSaecElHlN3kOQxyWbwCcT8W5FwXhU0523kSjaRJGTISPG9PT0kiAwrhB0GrR08fINxvlmc5CeSrL1BrJTE8y06HlN39Zw3oQvh4stK+LCgTWKa+vBp5b9uICOXFQSvE/FBsNPYpU2dazhQvy5BTYYhB5IVfoJ7CHNizfmqORD6jWLr1UbvvbgTB+tapUv7VZq3Quik90Tz8et5e3f7whJFB2INiw98KwAEJkHBP9R6twshc5sNYdEBRANv3+ZPL9QhG6IAfZfNpQlQ7sPxuoXJVYlCbGUg== Received: from AM5EUR03FT056.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e08::48) by AM5EUR03HT091.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e08::331) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Mon, 26 Apr 2021 17:15:21 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e08::43) by AM5EUR03FT056.mail.protection.outlook.com (2a01:111:e400:7e08::480) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Mon, 26 Apr 2021 17:15:21 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:FBF162DAEADC3BAF402902C7A71887D704EED09E534E2C61B0E32136B459F268; UpperCasedChecksum:6A281EA86066F4E66DE7677127FF4F7632A2D308E46DB37EEB868ED5358F09E9; SizeAsReceived:7377; Count:46 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.026; Mon, 26 Apr 2021 17:15:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 19:15:10 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [pfIvPpOaLsBzJ2UytlYjsqJAvFBIZEdq] X-ClientProxiedBy: ZR0P278CA0010.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::20) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210426171511.771280-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0010.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.20 via Frontend Transport; Mon, 26 Apr 2021 17:15:20 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: b97097a3-7e66-4775-733c-08d908d6df40 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUZz984a26XPHNORr4/6vxhDg4FfhJV7jdK9Pb5mK4sl1cFoX+7FX7Wad7oesX+5v75TcjbJ7imykQ4Aw4d38tbaWt2BnMsW65c44ZlH+aACeIxHLgMspDmWyQHTeNfhEhpwcPwlCfiVZm35TxvzsHl4YBOAt6Mw9rqyHWF693bZzfaiSEY5rpM1QgRieHPCIzAxv4dYKpU/atZ3YEgmOvnhaE33pI12kxtcyjXLmNA/0hUUvcfxdUye2qCM+rBLhD/8I3SyEvOKcKQWdEVeBXp+dKvtvj1BJIxxnFS/0+2FToI/s+WKCnX7KDNHXluv6PZHI0lDcgJfBDRPo4gicol6EsFcVmR1h5SXI9cvfj4ZBWf57kpjbnrBgvuoyQD20NO8vkq8pPnhNirCuMhb4UA4mmJ0SQ0wWnyy2VFEzyrH8zJxmiPEUKyfa9UFrTfF8kNm4TAu6s2suwT+qJiUhz4hlJboZW4hbMPOfrh9ZYYkSQs/m81f2yAphFkvzcR4ph5KZY1K+czbH0odzg5TlnjZ6ldyPQoMGCYlVvqirAmA8puXm5zHsI6/sw7MmXTRs9h9usiz+r5KguWoeUyKL5mjg7NUV9R7847IUKS0ZgkjOktvSYP/iXwA1ziz1ufVNQwRbQXImCt7iLKZ/pNcVMuZgg422OrGXXANh9ZJ3faMsQAweFUsDLjFkua+i24BNq/qLfcXZzWB/5b143oaSgSpnupf45wCQU= X-MS-TrafficTypeDiagnostic: AM5EUR03HT091: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9WMJ0oAItlKoCaDWggmogEEsQZ+kVmdZ16Zvyh4VGVR/1bl9ohQE3yaCFU8e1sX9U27sHDTchkbDADbVZdzBjfM8TKiXK2iftNnXb1ht6IspqLnH/0zzcxFMYi6UUO8P+e8clcZuSs5i/dO+wiwfGKIKxXk6D01LNRH8wn9+lGYaNqaiii+tRydXMxGFUjckT86odJAig6cGyXTI804f38n+gc6NOYpGS40xXhF7F7fdIQH8M7DypoCreqJoxeW4DmlRseSL+LXI7Js8oQjkXVOCKSzZZ5cEXTUyE1ie3iiIl1M+8pt4CnEgKjRyAaP+mrTqQiC36ZySS0ag+hiSUJ7z9tTuASsPEFZ12WefRMmVa+Iv6PYzZaDGapUnd+YiouV89l5UPbEJgWUi6ZOWwQ== X-MS-Exchange-AntiSpam-MessageData: n9RR7foLKIbWrlyaKr+aNtyzATNa8af7AdcaAaYFP8MFSnYGC0IhjJI3CKQ9e8+0ajwgXVrj+oriu091ex7fsJMRcX5Y3nEfMFp+zHtNIImBrxJ25QDAnAXtYVaRX0H3ITL2JdTZVqzcKhIqB7e/Cg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b97097a3-7e66-4775-733c-08d908d6df40 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2021 17:15:21.5940 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT056.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR03HT091 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/vc2enc: Actually zero padding 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0BRR+6lrOKmr This encoder sets the min_size in ff_alloc_packet2(), so it can not rely on av_packet_make_refcounted() to zero the padding. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 7bd2e4c2ab..6c2e873a23 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -993,7 +993,7 @@ static av_cold int vc2_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } flush_put_bits(&s->pb); - avpkt->size = put_bits_count(&s->pb) >> 3; + av_shrink_packet(avpkt, put_bytes_output(&s->pb)); *got_packet = 1; From patchwork Mon Apr 26 17:19:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27433 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp284745iob; Mon, 26 Apr 2021 10:19:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5btAm1yoSudqrDRIjMrju6mOnjSJf3I3fNQ+r4xLfFll0rJeFwuo4uvL2xb38g9De/7kI X-Received: by 2002:a05:6402:280c:: with SMTP id h12mr22128708ede.332.1619457572405; Mon, 26 Apr 2021 10:19:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ca21si13776629ejb.227.2021.04.26.10.19.32; Mon, 26 Apr 2021 10:19:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=nGtgcpt5; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4392F689D2F; Mon, 26 Apr 2021 20:19:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071062.outbound.protection.outlook.com [40.92.71.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87CB26806EB for ; Mon, 26 Apr 2021 20:19:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Se9lsoJ3wQ+fIrAgK9tPbtgwY/0RxlD1q7BL49a/ytfrYcDAeAinjUHpK0Txbguy1M4pRmJJMT8SUaDVGoAclQYRNF3jVi7LFc95pPO7eQB51WdLEj5in0mQPrXpTuZp5PavpF0XmTIyPY8yHXBu3D0t/NpFqq06kW0IU2WvblbppEbiNsO7KdKz1q2lldHj6ADpQzxHMmUkLeLxEtEDIHwuKQguQCntUeVNM0nlVCYiVbM9EN7qov9CsZfSA6CqF661pJZ3kCgL1RQ0UvI+9OeGEFATZ+3IxkrhY9XPR1S0Mnid+QOFAwiX2lyqS0lW71/0qVArUR5arVtUY/79cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XPx6rNUVfvLaaW64Wi/9OYfLWXYRe5W2yJbS1Rv3b5k=; b=oW1wTxtZHXSgpgabWjuQ8OF7yUwTsHSWnIUTjxd4JNmh53AE3H+uDWwMW9Vi3nPnx5sVaMx/L4t+gCt+vcRediG9ZhPql+PmJnQdhLNGEjb4nr0U2vQopGd6h83qlPJQn+8gOsMg2DjwoJtImzCQwrpImOd7BBlSXRV2mMRBiWLqzhctjrfhsQcs1y+YJgzwzTfOuRp5cThwS/iO2KXOUVW35y6cED2JMK6RYirtZhHpeJnAihEN9pfmSE4zyivryYppleo6JkXDCDNF+9/y340UUp1qvqQ4yVauvzFKvZOHHFAcQMqp3nmw4nMJZDpgFYpxJsVehyAG00uvJTNhMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XPx6rNUVfvLaaW64Wi/9OYfLWXYRe5W2yJbS1Rv3b5k=; b=nGtgcpt5wuGzfJ8GFKSFuFuklHrWOjTI6mGCso+NDMydfxJMsHcg+dq8rrShZhq+rWY10VivW0F97m+jLRXX8ztqkA9oQ5X79KZPOXEfmYhcpaNK7hjiGnAI0WHSGBPXZTwmxZUY82wM+rV1pNShE2ObXBHSPuZh67a4f9r4POnBx35GM1fIU3uVH3eKvfkxUh6CXgds+WOyEgeQmGUvspUrA0PqWjprwjvmG650aTw8wWFJMhxEg8qcsu2k35k8tVD56xM84NBHsn8q6n3euWuZ+53F63gSVvss4DKanMPvZIySNlT1cDdYl9RPaQAeTM8vJpmhqgZefqr5iCu+qA== Received: from AM5EUR03FT056.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e08::4d) by AM5EUR03HT118.eop-EUR03.prod.protection.outlook.com (2a01:111:e400:7e08::196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Mon, 26 Apr 2021 17:19:21 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e08::43) by AM5EUR03FT056.mail.protection.outlook.com (2a01:111:e400:7e08::480) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Mon, 26 Apr 2021 17:19:21 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4987828CC17E34ABAE2D2AC46386EFA83A73C26BFE4308C939439F6D7FDE0E4E; UpperCasedChecksum:A5BC8A4D147652B22063F53D86A3D165C470623F1D37BE757C74335DF6A4CB44; SizeAsReceived:7553; Count:47 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4065.026; Mon, 26 Apr 2021 17:19:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Apr 2021 19:19:12 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [L0xgF0N7RAPYSkNKJvQVYbLyHsUmvv1J] X-ClientProxiedBy: ZR0P278CA0159.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::8) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210426171912.771379-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0159.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Mon, 26 Apr 2021 17:19:20 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 95f9cc62-bb39-47c7-56a5-08d908d76e2b X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT7hZfWm/heSL81dJhaDdokPLx7EPjEL2AmvtV7xFD8Y6VFDbvt67QcpEWzz5rrfMOjxXT9WQcB6jBclWc+/pbKN1wrlZsCwCSnafWQly2Q50xHk9thulHqrKOq4PnUAm4YtM7gNfZJFTMVgUVehRYVT45SnkfXQoroU0wEQ69q6zZotqAnJYEGAPWb3w7WDbDKUZsFWYHvcpwuQ+yPYHrBxreBHLyUEbfW42Jxu87qj1zzOpn1APYaPeQVs1XlDm6sqB1dmmuSKmOa+MHRJAJopvgcTcjyDlzQ9xr7rX5j3XCMPkvjm+YdPARzOPCQM/akRrz0xsAmUc4APp6g6mNK+gZCTBUcHPfskvBgtGuiaNuqNt/rfVRDf7Y4ROrQ9qtNGjMqYIGJuolcsKZ8K2zJ83ObjWI8G6C8xwYpNyJ2kN7qSrm7ZCWIIX6SqjRRyJsQSX2QDwH4YmoQy2aEC9bj7evGs6VcDt+7k4+VNk1+Ls+aLn2nJwQ+RFDpw2fENHVk+oi3LiDhMzajKHl6Ee5zZ6Fy+kRnkEeogt8tLBppP9XbF/pYrtl0yWPZU1ykAek2gqmLzpZXFL03uV0xJOC6ujJed7R8k0cJC3TLk+gk6fA1hSlGO2WjJ88pMg9N/b5Ic/Kk4YdRKN+cHF6cWbpXdYZ1a70YW7WaA2WJtDgCqaSzKWOu40ZXw1B7EfTWJP5JuJUqXPj7TGR1j6N2fnE6bZcj+N3UnjEl5bHV9yOsVD2sDclvLVx4Giui8zca2E0= X-MS-TrafficTypeDiagnostic: AM5EUR03HT118: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: plfgk+JGs4La74/46RWWMIKlqBqjOUQeRuByspRXrQ95d7hjSkkrVIkEkRnOzxX2lSAlQv0M9KidkpkvxmE5dSyBjCxpBIq+j68o99J+acftOR7PSEXb9jyDRGBuGO5b3MANGfTA6TsyPZ8yfQfkU05/U4itqgpJqx5q9hZGPo4mMu/d89InXE7CUMZSy1f6X1NLSTisZPfywzfTB4tWvYxCI6649r02or7leUj2e5PSwrIuWaSf+IsGf0Q+fzyPAh2CLwv5bP7QG5XyXrrwoxxMlwkyi7OWF6J2NyANHaX3p7Cj2phU3fILi1/k3ENhXPX2uzB8+IASw0fowtxXz3XCqIxMZ5CPJonlL+lcqDgWrEWl5atP94O3JU01wbN1ZqT6E1dXDkoHZuOa34/crg== X-MS-Exchange-AntiSpam-MessageData: so/xRFXT7YqQJVsOvGVVKVaZmaW8dYKLW19Pj7W3hLem7uryurKqKpt1MfmpZ0wsUfR8lP0RWNkiVG7LEYvLwZR4goMFcv5v+l3saG+NEe9uixEuyzkDrggTX5YGDE7+eJP1hZkhahLfT158tOYl1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95f9cc62-bb39-47c7-56a5-08d908d76e2b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2021 17:19:21.1289 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT056.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR03HT118 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/mem: Also poison new av_realloc-allocated blocks 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: egP8KTIZG31j Signed-off-by: Andreas Rheinhardt --- libavutil/mem.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index cfb6d8ab8f..fa227f5e12 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -133,14 +133,20 @@ void *av_malloc(size_t size) void *av_realloc(void *ptr, size_t size) { + void *ret; if (size > max_alloc_size) return NULL; #if HAVE_ALIGNED_MALLOC - return _aligned_realloc(ptr, size + !size, ALIGN); + ret = _aligned_realloc(ptr, size + !size, ALIGN); #else - return realloc(ptr, size + !size); + ret = realloc(ptr, size + !size); #endif +#if CONFIG_MEMORY_POISONING + if (ret && !ptr) + memset(ret, FF_MEMORY_POISON, size); +#endif + return ret; } void *av_realloc_f(void *ptr, size_t nelem, size_t elsize)