Message ID | 20201013171533.793-1-joakim.tjernlund@infinera.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2D7064495F4 for <patchwork@ffaux-bg.ffmpeg.org>; Tue, 13 Oct 2020 20:15:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B5B568B99A; Tue, 13 Oct 2020 20:15:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2046.outbound.protection.outlook.com [40.107.223.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5208B68B8D5 for <ffmpeg-devel@ffmpeg.org>; Tue, 13 Oct 2020 20:15:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qz/dZljB98gPfW9eVHFOKg45UmhKOCd/oyKgqLGFrJeJxrEN9hPDWF664Shno37wQKAwM3Id7Ku/FNORRHk5uv+R8zNeMBM+FsIGzUsZ+lXqo7DDJuI7CVGdw+3X5j0kthhpkyvgaq2HV60LKJiLEAU3w4vQmk3dROWVpHpi3gTvgmXozWHMNcx3wEtN9DnbDzyA2h9w8FDEjM3G8gjS4Rim30UV/0CZDrCsXUibmB/e6SjOt3fCLdTYPpS9UG9tUJRfnHwA1TMgPwaLOFqnqaYmUH9X3gypLU1gi5EpHHbEOdZPYmpwj3JUGi4lqW0x33NmfBy2bRSCaJGxDUhfpw== 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=bAL+TogDlOFL93iIGfhSxmVqBrowP/BfcwSgcCByORI=; b=G7ntEG9u70rgI++FcUYlqgC3TlPSL2FIFzYtkG51MTBzNDALFh2+fYiSmZFh76vYLeSl9/h1Gg8tE1t7QqB8T4OmQWl0LfNfg5lP9ArUEi9KBpuznWczu97QfYBvTpJJML0zy267ZVTZ/yDkc9jz66qWtrQigNX+vmYneVvBxdd20xIiAcRHZHKPsseAjUeXd9IazN/+acvnPgxXbHk6lErWtiS+dYbsc8/Kl5pCFLYJV/ih6r3l2LU1UsZXLI8zIJjGg8A8ZsQRRFkd9ZKhkbfCe+0mW7oSH+xzdcArbNsSw3xcb69uXaa3Jcpcy5Dezby2184/d0s0SIEkm5QayA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 8.4.225.191) smtp.rcpttodomain=ffmpeg.org smtp.mailfrom=infinera.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=infinera.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=infinera.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bAL+TogDlOFL93iIGfhSxmVqBrowP/BfcwSgcCByORI=; b=WdS6vycV3BGcPwNDqYm/ijnWqx9wilq7Ilq4ns5fO5Uz2S37zjSYwjcG3WXCEzRJDEt0vcautCr5mOTw6JDnPo4YVmCMLppLXpS6UhpvSXy/9GKtk9IIiOyfmK/4eKVBwgpB/ccL1waokJEncKZz+RZBMXAE/fiiuvPT1JYqBsk= Received: from DM5PR04CA0031.namprd04.prod.outlook.com (2603:10b6:3:12b::17) by BYAPR10MB2934.namprd10.prod.outlook.com (2603:10b6:a03:85::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.25; Tue, 13 Oct 2020 17:15:48 +0000 Received: from DM6NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:3:12b:cafe::40) by DM5PR04CA0031.outlook.office365.com (2603:10b6:3:12b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Tue, 13 Oct 2020 17:15:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 8.4.225.191) smtp.mailfrom=infinera.com; ffmpeg.org; dkim=none (message not signed) header.d=none;ffmpeg.org; dmarc=pass action=none header.from=infinera.com; Received-SPF: Pass (protection.outlook.com: domain of infinera.com designates 8.4.225.191 as permitted sender) receiver=protection.outlook.com; client-ip=8.4.225.191; helo=owa.infinera.com; Received: from owa.infinera.com (8.4.225.191) by DM6NAM11FT010.mail.protection.outlook.com (10.13.172.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3455.23 via Frontend Transport; Tue, 13 Oct 2020 17:15:47 +0000 Received: from sv-ex16-prd.infinera.com (10.100.96.229) by sv-ex16-prd.infinera.com (10.100.96.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1847.3; Tue, 13 Oct 2020 10:15:45 -0700 Received: from sv-smtp-prod2.infinera.com (10.100.98.82) by sv-ex16-prd.infinera.com (10.100.96.229) with Microsoft SMTP Server id 15.1.1847.3 via Frontend Transport; Tue, 13 Oct 2020 10:15:45 -0700 Received: from se-metroit-prd1.infinera.com ([10.210.32.58]) by sv-smtp-prod2.infinera.com with Microsoft SMTPSVC(7.5.7601.17514); Tue, 13 Oct 2020 10:15:45 -0700 Received: from gentoo-jocke.infinera.com (gentoo-jocke.infinera.com [10.210.71.2]) by se-metroit-prd1.infinera.com (Postfix) with ESMTP id AD77F2C03206 for <ffmpeg-devel@ffmpeg.org>; Tue, 13 Oct 2020 19:15:44 +0200 (CEST) Received: by gentoo-jocke.infinera.com (Postfix, from userid 1001) id A5EFDB43F8; Tue, 13 Oct 2020 19:15:44 +0200 (CEST) From: Joakim Tjernlund <joakim.tjernlund@infinera.com> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Date: Tue, 13 Oct 2020 19:15:33 +0200 Message-ID: <20201013171533.793-1-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201013102942.24007-1-joakim.tjernlund@infinera.com> References: <20201013102942.24007-1-joakim.tjernlund@infinera.com> MIME-Version: 1.0 X-OriginalArrivalTime: 13 Oct 2020 17:15:45.0637 (UTC) FILETIME=[7CD92950:01D6A184] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 229bee27-c3ad-43e9-97a2-08d86f9ba084 X-MS-TrafficTypeDiagnostic: BYAPR10MB2934: X-Microsoft-Antispam-PRVS: <BYAPR10MB2934B250087B1F7D4B383812F4040@BYAPR10MB2934.namprd10.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bNi0Rst19rE9cLFrBH1MmrZFVQnEFNW7lQBi72J8ngH0KGUfLktDUwtmf7Hww+CDapJxNYuJT1GANfNuAhwB/Yqctzq9dD6ZX2WeOFU4j3pKxv6HfcABNYt+8Zc3+0uOgJxwkXCnlFioBrEqtj2myc6ja8lA6SG5h96v7K4qyPculSltuUxiEQLqGvGbvebnrf/RJskhqFH+xLi8z2WBc6+xsRlY3PqWrr7I+96kr1+KTZUdD6rucicGs2qUTFvoEtv9PfbkiUl3UCvuRfba9zZ2SGFe7OhE8jhnzVZCQYO7EpLWy9oWnftQD5SLm70cwcQ77tnF06Br7QmDEK3HIsNvNMGOc61DLFQ3tQMiO1NU140pSUcz/bdpDYlcm+jJMFO75fYy7lODPYtFKBjw4HApCISmKs5OTrMksAP18qIv0f7dprDaWkSxx3aLj3lVIUMCs/hNyw6LsRLoTrZEEOhuFTpjTT0FjHj+pmtQfa0= X-Forefront-Antispam-Report: CIP:8.4.225.191; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:owa.infinera.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(136003)(346002)(376002)(396003)(39850400004)(46966005)(82740400003)(47076004)(83380400001)(356005)(6916009)(83080400001)(81166007)(1076003)(26005)(4326008)(2906002)(36756003)(8936002)(6266002)(8676002)(186003)(107886003)(82310400003)(336012)(6666004)(966005)(478600001)(316002)(2616005)(426003)(42186006)(70586007)(70206006)(36906005)(5660300002)(86362001)(44832011); DIR:OUT; SFP:1101; X-OriginatorOrg: infinera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2020 17:15:47.2705 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 229bee27-c3ad-43e9-97a2-08d86f9ba084 X-MS-Exchange-CrossTenant-Id: 285643de-5f5b-4b03-a153-0ae2dc8aaf77 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=285643de-5f5b-4b03-a153-0ae2dc8aaf77; Ip=[8.4.225.191]; Helo=[owa.infinera.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2934 Subject: [FFmpeg-devel] [PATCH v2] Unbreak av_malloc_max(0) API/ABI X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Joakim Tjernlund <joakim.tjernlund@infinera.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> |
Series |
[FFmpeg-devel,v2] Unbreak av_malloc_max(0) API/ABI
|
expand
|
Context | Check | Description |
---|---|---|
andriy/PPC64_make | warning | Make failed |
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
diff --git a/libavutil/mem.c b/libavutil/mem.c index cfb6d8a..7463e38 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -71,6 +71,8 @@ void free(void *ptr); static size_t max_alloc_size= INT_MAX; void av_max_alloc(size_t max){ + if (max < 32) + max = INT_MAX; /* be compatible to older(< 4.3) versions */ max_alloc_size = max; }
From https://bugs.chromium.org/p/chromium/issues/detail?id=1095962 ---------------------------- This seems to be caused by the custom handling of "av_max_alloc(0)" in Chromium's ffmpeg fork to mean unlimited (added in [1]). Upstream ffmpeg doesn't treat 0 as a special value; versions before 4.3 seemingly worked because 32 was subtracted from max_alloc_size (set to 0 by Chromium) resulting in an integer underflow, making the effective limit be SIZE_MAX - 31. Now that the above underflow doesn't happen, the tab just crashes. The upstream change for no longer subtracting 32 from max_alloc_size was included in ffmpeg 4.3. [2] [1] https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/73563 [2] https://github.com/FFmpeg/FFmpeg/commit/731c77589841 --------------------------- Restore av_malloc_max(0) to MAX_INT fixing MS Teams, Discord older chromium etc. Signed-off-by: Joakim Tjernlund <joakim.tjernlund@infinera.com> --- - Cover the full API range 0-31 libavutil/mem.c | 2 ++ 1 file changed, 2 insertions(+)