From patchwork Fri Apr 3 22:46:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 18622 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 91DB544AFFB for ; Sat, 4 Apr 2020 01:46:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61EDC68AF97; Sat, 4 Apr 2020 01:46:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AD016880A5 for ; Sat, 4 Apr 2020 01:46:48 +0300 (EEST) Received: by mail-io1-f49.google.com with SMTP id y17so7291449iow.9 for ; Fri, 03 Apr 2020 15:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=hZsXDm0uYXlkGCGSCk18cCD5wwmowZx8svyHEeFAW7M=; b=fheaBArouJOzleGdmN6ednmNQHcCNcmgQFEjAxvXnNzRqgTwowf5Meu8U3Ykt+xBjI oLfEpNlLMq2+OtKDSQcN3P47kdWuGZ3T2MOflNgX7BPStzaPu3WkNRWBswpWY8UPz4Qh Ksf49kqLTzs27As4Luacj4ujTre2r8oYUD4Xvzatwt9mPXs2RtiSYZ/qL6GpwkJU0UOP FpxqtZ1RzBSyvfa8WruSlMiPc1GJ+1H1WfBoK3FVsks+CX6k/oJBsS7o2+P2WvUZl7F7 2IYFuemFahwqx8tWI/qBwtqzdlnyMyl3IYYHT6lnbCF4OSMA3dHrlNY5RBdr0S+XuoLy FuDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=hZsXDm0uYXlkGCGSCk18cCD5wwmowZx8svyHEeFAW7M=; b=T4pEmvI4TWgSZDVja7fMvXUVfj43gMnjCJCU7WVndAeNCey0/J/18PXrBA3Mc/5ICy bnYf0UNfxYO+drOsWd7BBwuF/ah2KEqbTgwDffOn3rQ2LopJ+/6BjnaXoCNc9g8O5VlS Rnn8+jV0kY/vlBTDW4JULgtu+8SSqqkBN5RQtGNDPGaF09XzRsK+1HaQfK4agTRDm6vB z4U0l5TeHG/6Oj3E7PKVc4k75SOOlTcWB3gau/VPm2avqjX6eIqFFk5i+B+i9NQOQ29J j+Y7mZgBrQDLWXm+fyBVcL5zsmIY5JmrV27NBXRIqBmV9NPY4tn3m4VetgajCtomXPP+ 50OA== X-Gm-Message-State: AGi0PubfsSZ3z4ckWMLxcSuXw1273spJCs+0AEuOKUPdRiS+329QsFZg 96HAtBcwPVpcJ6yl6VoPI168et/GEcFZkbDCY0znKg== X-Google-Smtp-Source: APiQypJqNcyhj8r9qoYKIQPiwlOf0JAJAMfQzrey0bdf0HCEEIkxNYnIj+4cwonHWS5d0uHLpj1vR4nip3DwHmR0jDM= X-Received: by 2002:a6b:c9d2:: with SMTP id z201mr10070986iof.169.1585954006953; Fri, 03 Apr 2020 15:46:46 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Sat, 4 Apr 2020 00:46:36 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavu/mem: Make alloc array functions more similar to av_malloc 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch makes the alloc array functions more similar to av_malloc, depending on max_alloc_size instead of INT_MAX. Allows a work-around for ticket #7140 Please comment, Carl Eugen From 7ae240a9f7885130251031aba5d0764b11947fec Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 4 Apr 2020 00:37:03 +0200 Subject: [PATCH] lavu/mem: Make alloc array functions more similar to av_malloc(). Do not limit the array allocation functions to allocations of INT_MAX, instead depend on max_alloc_size like av_malloc(). Allows a workaround for ticket #7140. --- libavutil/mem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavutil/mem.c b/libavutil/mem.c index 88fe09b179..8783b85a45 100644 --- a/libavutil/mem.c +++ b/libavutil/mem.c @@ -183,21 +183,21 @@ int av_reallocp(void *ptr, size_t size) void *av_malloc_array(size_t nmemb, size_t size) { - if (!size || nmemb >= INT_MAX / size) + if (!size || nmemb >= SIZE_MAX / size) return NULL; return av_malloc(nmemb * size); } void *av_mallocz_array(size_t nmemb, size_t size) { - if (!size || nmemb >= INT_MAX / size) + if (!size || nmemb >= SIZE_MAX / size) return NULL; return av_mallocz(nmemb * size); } void *av_realloc_array(void *ptr, size_t nmemb, size_t size) { - if (!size || nmemb >= INT_MAX / size) + if (!size || nmemb >= SIZE_MAX / size) return NULL; return av_realloc(ptr, nmemb * size); } @@ -243,7 +243,7 @@ void *av_mallocz(size_t size) void *av_calloc(size_t nmemb, size_t size) { - if (size <= 0 || nmemb >= INT_MAX / size) + if (size <= 0 || nmemb >= SIZE_MAX / size) return NULL; return av_mallocz(nmemb * size); } -- 2.24.1