From patchwork Sat May 22 22:18:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1700369iof; Sat, 22 May 2021 15:18:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxySep7pw60pf2/loG+KUVpAvwGby97FcvGon0BxJU/fFWZsU76Z7sHiGtPTQ2TPrqBEw2Z X-Received: by 2002:a17:906:b191:: with SMTP id w17mr16663374ejy.200.1621721918900; Sat, 22 May 2021 15:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621721918; cv=none; d=google.com; s=arc-20160816; b=ywIhbgUs/hTEApDx8PL3R9sWcAkjc8AHmn2uEHv4mJqrseg76bLppwz7FZlQOUO/5G uyb6GYDcqBVFcExgyHIbUg7XMqG0q1aW8DM2/mFPyeLhlqSyW64QHR2b2T3N3/4pS/cu TQHussaDeheRVKjWQRODFNJJAE1bNMY7pixjk8ZU7lVfcWghlpEa2gBcQPG6gNrNyMND O4HeeisAhaKmyEjcexGw0JE8SxKUsEPZC1TJmgdRPYtKI14nzLAVeeXrNebc9Fjwhs6R znriAdIDfA0hC+Mg3s9cL+A1X6q6ISSiHV7gFNzfbOWy4NbIC/3oP4WszEKpUxt53YuF ITOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=KlSh0mJipldsuhaf8ZfS+o+ii/IvTtSvi6P/RdhO8vM=; b=lbu6MN+QthqButWkanhYprzxY5mETQf29gdRqcWzLUWTQknEwGbJQBKGhI3Tv184Cu Vgk54QAB0IcwQfX2wtACka1eRHqUpKxoPC/BZ/N+2+URGV/zL/KokQT0G4hYQ8BCWlPj TfqQqKwKXNjW87OaRcqJtMnODRBue+xPiDPAF5Ia1qtPkpzUp+QC6qBjeiYUJgyWlX7a OPdMWRpfyv3s7X0beEWW9ouiZyYdML8lV8y/xAYaTfWwIWuRFkmQh/Vg5LL69RrEu2lG 8pV7R4JxidrIkuRNmffVJJ3k/wiI3kTZmKSP5+QOh/IxF7m7Ci+lKsaNyVrvfz8iL2C4 oTQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=psLxu2py; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g19si9600291edu.311.2021.05.22.15.18.38; Sat, 22 May 2021 15:18:38 -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=@gmail.com header.s=20161025 header.b=psLxu2py; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFE23688342; Sun, 23 May 2021 01:18:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B1986802E5 for ; Sun, 23 May 2021 01:18:28 +0300 (EEST) Received: by mail-qt1-f173.google.com with SMTP id s12so8797670qta.3 for ; Sat, 22 May 2021 15:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=y40sHdLKg/T02IYoD9duNVEJNUVXg0H2Bcv1kyaCH2o=; b=psLxu2pyedDIJI8NgsATcGPab7doKctoudEC1n/qWg8ctjF+mYjf551LoVRgOS6kPy UPQlUOU+7wKgjPtaPC9g5iBBsa2msrzjeP9YRfRMI3EzYZIfMEZ0U976faSXnPMzR37a KhJOJhM+g/E2CjtORpEgjnMKL965+cFQnmr8Fxvk8ZhfG0SDn8idtpSXHdAD8Ed/B+lE aJ4/yGrTFbs4Io1ODHRcOQ+1rdvi8QqFPjnvWj/i7L0dek0k/HT2h4vbEWaL/NYmcHOX Sir0UbLKllXhIgI8IkaiR5Go24ZSZw2TPnFwVMMlOqYBtZQhb/Bc6/fZxgJxCq+UAn+T riOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y40sHdLKg/T02IYoD9duNVEJNUVXg0H2Bcv1kyaCH2o=; b=mXuz847W4ocJXQMiY9yq55pZIuyWgPJ/+Mj+TH8ahaBHHNSRj57wr7gwdmTCHj/UPO 9gLx+l0uZ1IZ/K+X+zZsn7v1mmhN6za9n1h4aZUJRuxJLs0420XjVA+JSq26tGxfqQnb HZwujQxTyp63sit2BD25GdugNlsgdGM1dml86+Wyql0sFjkYQ2ao1nGCl3TQXFRHAiTf Iq50+m+CqqVAb+69mjTQH+Ni4P2GYpozuMaaW0ClpmbLdnxRKniDRzNFjM5YsleLdSMr jZ8pFVGPS5zP4SBQXfOifuurHiQdWruoI0ebxNw2gkXZM6BgQ21TlFG/43o0Rn2TfH0N VvoA== X-Gm-Message-State: AOAM533RMjqYc1FAthbu9w/QcYRz5H0Pguj9GnoBsdhptBhUFRs2eM4A hHuNbqKJz1msPxeE2u4rzZIUsIs50DA= X-Received: by 2002:ac8:51c1:: with SMTP id d1mr18659431qtn.4.1621721906783; Sat, 22 May 2021 15:18:26 -0700 (PDT) Received: from localhost.localdomain ([191.83.214.167]) by smtp.gmail.com with ESMTPSA id c14sm6911965qtw.42.2021.05.22.15.18.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 May 2021 15:18:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 May 2021 19:18:10 -0300 Message-Id: <20210522221810.7076-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210522220904.7012-3-jamrial@gmail.com> References: <20210522220904.7012-3-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3 v2] avutil/mem_internal: use av_max_alloc_get() in ff_fast_malloc() 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" X-TUID: JjJ76ww4P6Cv This puts ff_fast_malloc() and av_fast_malloc() in line with av_fast_realloc() Signed-off-by: James Almer --- Now freeing the buffer on error, since that's what the doxy for av_fast_malloc() states is meant to happen. libavutil/mem_internal.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavutil/mem_internal.h b/libavutil/mem_internal.h index ee2575c85f..fe3cf7ad23 100644 --- a/libavutil/mem_internal.h +++ b/libavutil/mem_internal.h @@ -24,6 +24,7 @@ #include "config.h" #include +#include #include "avassert.h" #include "mem.h" @@ -138,14 +139,22 @@ static inline int ff_fast_malloc(void *ptr, unsigned int *size, size_t min_size, int zero_realloc) { + size_t max_size; void *val; + av_max_alloc_get(&max_size); + memcpy(&val, ptr, sizeof(val)); if (min_size <= *size) { av_assert0(val || !min_size); return 0; } - min_size = FFMAX(min_size + min_size / 16 + 32, min_size); + if (min_size > max_size) { + av_freep(ptr); + *size = 0; + return 1; + } + min_size = FFMIN(max_size, FFMAX(min_size + min_size / 16 + 32, min_size)); av_freep(ptr); val = zero_realloc ? av_mallocz(min_size) : av_malloc(min_size); memcpy(ptr, &val, sizeof(val));