From patchwork Sun May 23 14:54:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2188583iof; Sun, 23 May 2021 07:54:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzVEGJZCgi64c+8EYLu29z6r+njOOp1okLhaWUZVRFXe7996wLV2J1/F10ACXLaki7adIJ X-Received: by 2002:aa7:d843:: with SMTP id f3mr21003000eds.270.1621781699762; Sun, 23 May 2021 07:54:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621781699; cv=none; d=google.com; s=arc-20160816; b=kVaVtaUrf58KgxCc9h31Pe45mCwAbNQdwriaDhE2KoqXLpSvpZM0tWlBZ27DBoMznS LasTl8vaQoX7F0xvwjmiI5DrKM7DQk9PkLPd0vKKknSW+PLNk4i0XoWCrTSxewXjArhC EL9/LpUF3Vd5SL1xLVb997W3z6YTqaiJUqq3Fhhp88QK/UHmrMnQ6KHZYhOSLz2ZitrE 7vvPGacUtTkpltidHQjNpQOo+bM9GimqzuYwa2SJ+K8q3TCcRS3hJzABXBJpdvv3KB5p mVq5l9Tcw9dN9eVN2MN4tPS+1MPtXqsD9jV5wtR+LLyighl1eUt1BzMgF+pogDEyfCoA dLbA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=YPslmvH71FFkLnTSrwKLiXsPMTn9TsVt7P/e67338dk=; b=gY13xhKtK9qocrtOM2U6JNrqR0S7rZj2VjMnQ2+1jMF0h4QCAybCx15PakDYq+OKqT Vd2fXqhRy+WjHJ+T7G3TROdKi4bzQ0xpHadgBdna6M9U8X5BBcpyDWKCpxWQ3pdJrJLZ moWOPAF1HG2albZSn0SPsmlVUzTPH4FHxTjtPdEw8yvHruaaurJk1dm//8sNY4hNJjWI VVD9iyN+uVLwleWKLzrahfCh9eZKjKMbNRcXGbohHLWajHLPTPy+QRDG21I/QXr71pyP tWFksY/zOCG2yPP5V0QVMZRHq+5xj9r5ehnVlXXUqhTtW++5zclOoMiVv5u1DKnJVBmN KVSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G+9ILtYM; 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 cb1si9977896edb.233.2021.05.23.07.54.58; Sun, 23 May 2021 07:54:59 -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=G+9ILtYM; 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 9182E680C28; Sun, 23 May 2021 17:54:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA8C068018F for ; Sun, 23 May 2021 17:54:47 +0300 (EEST) Received: by mail-qt1-f176.google.com with SMTP id m13so18863478qtk.13 for ; Sun, 23 May 2021 07:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=TQwUOwdv7BhJYl0LQzSfoHFYlSjlFzjtESs3ExUIDP8=; b=G+9ILtYMWJEnWSXje0c/mQlFPJAphiQgyuHTiqg2asmnXf6lJWAkGI5gO9kyVSZnNZ 9p4Kx4H0b1cuX37aoZN9ESqwV1+GJpqYSPHWb6iq00o8ssPeL3R+NynbD24qGdlFDpgm fiN4p5AG9WGs0sDyrIToozWup/suCBWYHG+9xD/enGrloKqNJ7mUbMZD/eAfip0iQgLk sDnsC5Jt0gleYSXJJeyfjp+EmC2ioGu338yvdAnVomE3kTzCk26hDvsMXXqOrVSzvx/4 6fnPbgYSG+kj1e7llACxLWM7/3xxZHjP2EannZeQuO2GJx80tuhgl1eT8IK0RY6xmvt4 yNVg== 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:mime-version :content-transfer-encoding; bh=TQwUOwdv7BhJYl0LQzSfoHFYlSjlFzjtESs3ExUIDP8=; b=DOOMlMQVOx9pyeMUFML1cfndU1O1uFNOc/Mg9R09XaGXRrsf2YZfZ7YTLso+iQhB8w 3NJNoyNugncaTTMDN8FIYv44Xrx9GVPrIWyTfJI2uDJzMpv21l2+N/5Ak30ceMT5UURL pRnqr9mRa8+s0IR5v3S/x+saw70hAgDkXDzxxH/61Cd0JTPHjdl7t2gPoSdc2B22l5nM 21xQgxdyOFUhPltcjZODDQh0JXVg/MVE85cIQSauqXt2jJbOX+NkjlbLG500NvKN7x6L KV3/5YjVNLTnl/Onw9UV1KGHpdn5aT5xWLNz79zcIvvQ5GUa6PeBTkNrCPQSlTMl0EnJ ffJQ== X-Gm-Message-State: AOAM530+u0Nzzw1BfLFCeHYU+cAGd32cGHUi6OctaDf1iXg3GRS2ondN ND9VRP6c8uty/SMedyD5eoiRZTaDaK0= X-Received: by 2002:ac8:5d93:: with SMTP id d19mr22266975qtx.289.1621781686329; Sun, 23 May 2021 07:54:46 -0700 (PDT) Received: from localhost.localdomain ([191.83.214.167]) by smtp.gmail.com with ESMTPSA id t17sm8090977qto.92.2021.05.23.07.54.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 May 2021 07:54:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 May 2021 11:54:31 -0300 Message-Id: <20210523145433.5426-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/utils: don't use ff_fast_mallocz in av_fast_padded_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: YVhVPwJJ68t4 It will be removed in the next commit. Signed-off-by: James Almer --- libavcodec/utils.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c08f9a7da3..5394a179b0 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -29,7 +29,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" -#include "libavutil/mem_internal.h" +#include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "libavutil/imgutils.h" #include "libavutil/pixfmt.h" @@ -49,25 +49,31 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size) { - uint8_t **p = ptr; + uint8_t *tmp, **p = ptr; if (min_size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { av_freep(p); *size = 0; return; } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + tmp = *p; + av_fast_mallocz(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE); + /* don't zero the padding if the buffer was reallocated */ + if (*p && *p == tmp) memset(*p + min_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); } void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size) { - uint8_t **p = ptr; + uint8_t *tmp, **p = ptr; if (min_size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE) { av_freep(p); *size = 0; return; } - if (!ff_fast_malloc(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE, 1)) + tmp = *p; + av_fast_mallocz(p, size, min_size + AV_INPUT_BUFFER_PADDING_SIZE); + /* don't zero the buffer if it was reallocated */ + if (*p && *p == tmp) memset(*p, 0, min_size + AV_INPUT_BUFFER_PADDING_SIZE); }