From patchwork Tue Oct 13 10:29:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 22912 Return-Path: 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 D5F1844A7F3 for ; Tue, 13 Oct 2020 13:29:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1ED068BB09; Tue, 13 Oct 2020 13:29:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2064.outbound.protection.outlook.com [40.107.94.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6518968BAE4 for ; Tue, 13 Oct 2020 13:29:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RNDntzNTqXx2Xh1aFF5ndNA3ZDvlSpDUX8RdYZPiP/wTVT9MJScc9NhEhLNDuseAoZ79ZURHIyW4A8hiFDAljyvERa9WyDT5SQW6Y9iWESv7OZZqZ9ueFxtk95Mdh+wqqbuTjrufc+Ujzmzp6mP7qmRFj3K6/Qn3GymvptG4Il4WjfWN78ixaW+yaBoM5S3+G9z9QURMbjoCQ1pEqsBwhyD28rj9MbqNoKGjnGzjBhboMiT6wA213FqMH75Jqa6dKHT9AHG12QuOuvCgpE/KlfEqnttk4FCim4MFAJPalkz6yasCUzWrdBDpntvcFuCIrfAkTso/KSNPwRtarmjCCA== 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=ormkX2WxpPD9SpxF3YULNpk0rHKZmF1/HN8xLQbORCg=; b=YGqmFj2I/ZI8aPVfSrBMHV2Yw2vHvHiYYB7TmWlfYBpdIpcgI+JvYPhxOxLhmNHIB7zVU+y49Ya4udOAqU7R9apCLF1X4be9EKoAswy3hryp+Vw2WWH9ey/z66d7ID7e0HC5VuMA2BuPDWLnYlX+i8J6L9w5PbjPLldtX99ztOXHd9/hpzcQNiJoaXMHkfristo8g8Fr2/LjFzeXzO1HxCz5LeADTO3LnbmgcJHB1IrehC0xkzG7iT1D7ye87eneg663d01S116S8ATQ8CtAf+K6ox5XUOrJlKWQbMzZUm1pIwx74twpQQfTogDeSMgApuQf4ymWq3X7WXKgM9gWBg== 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=ormkX2WxpPD9SpxF3YULNpk0rHKZmF1/HN8xLQbORCg=; b=NuQ5uv99MWkJjMWJxRW92gkHUZzfUq5NtbKuZAxkH+FEtoOgklz+ag5NyHnUmuWKKYBadMYAGvSHKpnRccEJsCHlSYxp8dl9OksXJ0xhWCRu9ANTA7IdCBH63AhsYES2Ca5crOUTdpi31zkuTmjvuBNWXpjh7esWcKB+R4PPKxk= Received: from BN7PR02CA0006.namprd02.prod.outlook.com (2603:10b6:408:20::19) by MN2PR10MB4367.namprd10.prod.outlook.com (2603:10b6:208:1d3::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23; Tue, 13 Oct 2020 10:29:46 +0000 Received: from BN8NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::1d) by BN7PR02CA0006.outlook.office365.com (2603:10b6:408:20::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3477.20 via Frontend Transport; Tue, 13 Oct 2020 10:29:46 +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 BN8NAM11FT035.mail.protection.outlook.com (10.13.177.116) 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 10:29:46 +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 03:29: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 03:29: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 03:29: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 843182C03206 for ; Tue, 13 Oct 2020 12:29:44 +0200 (CEST) Received: by gentoo-jocke.infinera.com (Postfix, from userid 1001) id 80348E683; Tue, 13 Oct 2020 12:29:44 +0200 (CEST) From: Joakim Tjernlund To: Date: Tue, 13 Oct 2020 12:29:42 +0200 Message-ID: <20201013102942.24007-1-joakim.tjernlund@infinera.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-OriginalArrivalTime: 13 Oct 2020 10:29:45.0484 (UTC) FILETIME=[C510CCC0:01D6A14B] X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1a088af-c0e7-40b4-5931-08d86f62e81c X-MS-TrafficTypeDiagnostic: MN2PR10MB4367: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U31afbfZrxiuxP/0xCgJqndUw+QU7jWg5ODdwIm+bq1nZFmXlGrSfuDuzsyD4Et/TIFp8IXrQkjh60ETNPanIkPvMlgevmxvlYtjp1KSP0kUzJEGRUyyk6yF4+Y8ublu9LcGz3z2vCxL5O/bzNb5I+Eibt3bK0sLKeLjvTSk2Uu8yQYXpzqoTsY4FUWV4l69fi4qxxEPCWymTuz4Adtz39edxBq/WLPVDYYg8wBVDpSKYMIVhdYXL/aqsa3I7usNUQAgwHNwI/i41Ut95cuLnaF71Z0OLOrkSZTMFET5FwK9p6QsQk1bzhJ4J8d39xpkI+aXuRNaJDUzkJjg8BKRIejOiSDKQGV8eOFqXzLOrBrVhstTUXUB433XL20QBkOsh0C9pZGyyekIIQx/euttM0mCVSemjNE5uUkmmGJelv88SfSCDh1sX8Ok9kXN1i4AZO9JAGuBxP8XYzJQ/OXhoSKhq0sZX7Ljl4XGq810sZE= 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)(396003)(376002)(346002)(136003)(39860400002)(46966005)(82310400003)(966005)(6916009)(1076003)(83380400001)(83080400001)(81166007)(356005)(5660300002)(44832011)(478600001)(82740400003)(4326008)(47076004)(6266002)(86362001)(107886003)(36756003)(336012)(2906002)(316002)(426003)(36906005)(26005)(2616005)(8936002)(186003)(70206006)(8676002)(42186006)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: infinera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2020 10:29:46.3086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d1a088af-c0e7-40b4-5931-08d86f62e81c 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: BN8NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4367 Subject: [FFmpeg-devel] [PATCH] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Joakim Tjernlund Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- libavutil/mem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/mem.c b/libavutil/mem.c index cfb6d8a..52c2b1b 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) + max = INT_MAX; /* be compatible to older(< 4.3) versions */ max_alloc_size = max; }