From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id C71424C6F5 for ; Fri, 12 Sep 2025 17:58:21 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'5NPaG8OHQk5ttdVffSs8ejDMF6PtNbEGm1KypnucCuM=', expected b'RIIwIgVYbd4UAZr3iceBJNHxLg2dAjS7lk6E8ENXV+Q=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757699897; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=5NPaG8OHQk5ttdVffSs8ejDMF6PtNbEGm1KypnucCuM=; b=10+mOwSu3jEJgXydgSL/zkC6QjPLNquXccXdWMdewVatVp7s39AFgAfVfBJgc//IUdWni NZs4F6HKAZXXdz0U+V4nc52zsi4onEvUgEcx/I7yaywvIltMofz4GJoCJyE/+U/Hy/iTg7g z+zIVPIir47Hpp+jqw4cmZS8VzejGiQwDSn4kXRT7yZP04tRst6zHN4HtX/vcNoyGvBbDKo ov4Zzs73Tum/igmB72ljVZ07O2Q0NKSSuca5eA1z9LvujFZXh2H5aezGWsKF+ON3WNQ+3/k hiNl72zuUtjuH824utKgwNSsgeO7R44e+vz65TGCwHl47zuVitcyLrQlptFQ== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id D307268E814; Fri, 12 Sep 2025 20:58:17 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757699897; b=TlpSMHQUCs0oKBiEyvqH4C7ITKh+qXdyisOMGUqrF6C8nRWm9vE0vjZSTCawD6kpbjDeU +4oCuAdYW7PHCujG1R8yIVzmAH4meZvM/AdemSwaI3PIawoXIwP0KgxhMoCkXIs5YNc6Z+D pCnqiafX4I+pFYvgW7iWtfrKyJD7x8vDa0t3lg5AZi/hyle+KxriX2EvYDydJu2wQ7ktVxl M/LNBJMdRpgwbKKnJNy3EtqY16B/Pp47kAL1t1DNNYMELIgYC8IvTWhtkhFQt616dCp7BkA //8H1gs6H0sMY17hAT07us02BnaPz+DML0ejQbVcRLb6MXMbQVfwctkwo85w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757699897; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=L5mHQ+8uG8uj4BKIIYMqoSKdClY7xTgrOgxpQuB0LHo=; b=N7CRmFuZ7rXZkq4ovRU3l/lOKf95o9dujZQNUTK/pW4/BXE9Hue4sOVEUzlvM7nzBZpPD JC2O28t3TuL4FmyjV8XveBvONHA5WrvWSde5RsXB22QPWQdRWOptLkT/KllSRQtvOXhiUKh DS5L2crplSyUVkWoLafd15uvw+QoQYH+LJaCSsCWBN46iJA1vTd/teV1dQDAgCUj7vzDfkL drJb8jef4w1cLqqpJptCLyMcES9ugYkONKC5PmwHIn6Y952CtwvaPClUp546BtVplQJvPfV k1ZWghBGoptoPcQMXj9WxWfkmkEFNySJG42Nbdv0R9XRxTp9gaVXt1Wzvw9w== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757699887; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=RIIwIgVYbd4UAZr3iceBJNHxLg2dAjS7lk6E8ENXV+Q=; b=gy7FSVsVQ4PKtIluq+moZB8blZzs5TkNiHSG4/h7FeT8vULug737PsM75PvJeF9e5k+2x jlXxjZ/Ouz/TtUnZiqbUSIXjjT/DFJHaLJBYVqwcBWyzSP6M1v8xpH1MEeSAs+WD5cTijST o1jwxFZIekys026rCWAPcTWYDeJLBlQKQLkWXuWIGwZCgJUaFbQCxkp5qyEeV5/HYaQFl3u gI1EYzj8PteHn5NSkE1Z53ShXBCGfqT5xsPFPmaZt5h/r/18aHtb5TXqAz63TKdfJddQNAC r7QfcW5p/BLGXRqVpTlSLEgCjTYcflDyL3aa5MYkPn0Qx702rfL4IMjD7hNQ== Received: from 3f9d35a0eedc (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 133E26801D8 for ; Fri, 12 Sep 2025 20:58:07 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Sep 2025 17:58:06 -0000 Message-ID: <175769988724.25.8554154946274968285@463a07221176> Message-ID-Hash: CAAIZ3QXYJAKSUEJ4JSHUKFCRFON45SK X-Message-ID-Hash: CAAIZ3QXYJAKSUEJ4JSHUKFCRFON45SK X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/bsf/noise: Avoid allocation for string (PR #20506) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: mkver via ffmpeg-devel Cc: mkver Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20506 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20506 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20506.patch >>From 77afa9f560fb883d543184911192acf918ea9b9c Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 12 Sep 2025 19:34:39 +0200 Subject: [PATCH] avcodec/bsf/noise: Avoid allocation for string Signed-off-by: Andreas Rheinhardt --- libavcodec/bsf/noise.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libavcodec/bsf/noise.c b/libavcodec/bsf/noise.c index a622855717..3462b30f82 100644 --- a/libavcodec/bsf/noise.c +++ b/libavcodec/bsf/noise.c @@ -18,13 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include +#include #include "bsf.h" #include "bsf_internal.h" #include "libavutil/log.h" -#include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/eval.h" @@ -79,24 +78,22 @@ typedef struct NoiseContext { static int noise_init(AVBSFContext *ctx) { NoiseContext *s = ctx->priv_data; + const char *amount_str = s->amount_str; int ret; - if (!s->amount_str) { - s->amount_str = (!s->drop_str && !s->dropamount) ? av_strdup("-1") : av_strdup("0"); - if (!s->amount_str) - return AVERROR(ENOMEM); - } + if (!amount_str) + amount_str = (!s->drop_str && !s->dropamount) ? "-1" : "0"; if (ctx->par_in->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME && - strcmp(s->amount_str, "0")) { + strcmp(amount_str, "0")) { av_log(ctx, AV_LOG_ERROR, "Wrapped AVFrame noising is unsupported\n"); return AVERROR_PATCHWELCOME; } - ret = av_expr_parse(&s->amount_pexpr, s->amount_str, + ret = av_expr_parse(&s->amount_pexpr, amount_str, var_names, NULL, NULL, NULL, NULL, 0, ctx); if (ret < 0) { - av_log(ctx, AV_LOG_ERROR, "Error in parsing expr for amount: %s\n", s->amount_str); + av_log(ctx, AV_LOG_ERROR, "Error in parsing expr for amount: %s\n", amount_str); return ret; } -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org