From patchwork Fri Dec 4 22:57:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24347 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 77F11449191 for ; Sat, 5 Dec 2020 00:57:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 53C9168A5A8; Sat, 5 Dec 2020 00:57:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f66.google.com (mail-ej1-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51B77687FD2 for ; Sat, 5 Dec 2020 00:57:49 +0200 (EET) Received: by mail-ej1-f66.google.com with SMTP id ce23so7215879ejb.8 for ; Fri, 04 Dec 2020 14:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=Myfd0zv+v0PisVaIbM+Ga3Rbp6MfZq3pZnc3UFiAULU=; b=YGc+vhzRTJpJ05+TBzPQiMVwjYVwHb8jYhMLVmSid3J4rJqt9YPNb8eWEtQmpdiovG /A/18AL6i0eBPE1+1N5ZjQIbIATznqbKiZr96WwJK5vUW18qfNF3CVM9l9HmDa95t4Gx 7np0OU5QvX1mf6raYIgHkRqM65Bdn61aQyXiqF1vU0qioneb0CJFsNov4mlGIr8RlDEa UJLK0dn5pbh5iHUZUDdlw63l41Fz40pqOL1WCdBcXxGtN8gSXJ8v0stbKCg/jQRyHP6Z JhQcjmq+S4tbYY+9YtkSE7MNtzf/HgJhqMFcDDc4R+P4RGjXx5D2RDgS+Qgri4asZNbQ qf+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=Myfd0zv+v0PisVaIbM+Ga3Rbp6MfZq3pZnc3UFiAULU=; b=F1MJda5BBopUHgT1PD/DaqXA6hTC/vZ5SvboBqSGjoIEqoCxQIcn3CdqVUxkMtIk3F T7gO9/4ilVjLtm/GYq5vDHeyGGpeSYwvQYpUD/+H9P0qm6OTSXuMPZy0ZurBocXTb8fb +qOhL/Arl39UA1bqglrXb6nk1+5jRrY/uJc3/UUcTkyzTxdGWzOQ0zihq+81HVZrCiUi EPe9G1LlhHOBWsikuq/6/J8OrOpvqzn32dH1Y6eqXzrMOpq+5ZCjvbMBmMCNKjH0RakS XKWbnFhgon5lJe8xeFu7LH90aDXTPoDMT3tOq+/YmtgzURXr0ddCQoR5G+siYqfcWeNO zpsg== X-Gm-Message-State: AOAM533gaynwzX7ummWa48h3aCwXSHc/zcS9GDLj4Xvs9hNUU01fBV9z RNj8i00iUKF79w1oij39ewUOZGLRiO9mng== X-Google-Smtp-Source: ABdhPJyWlIN1FeyjGXOMs1C5PRUiiKi/dPp/cZazQNd5IcUjX3gbZMlA67xclpFBK1Hq+6dIu2kO2Q== X-Received: by 2002:a17:907:1004:: with SMTP id ox4mr9132779ejb.240.1607122668444; Fri, 04 Dec 2020 14:57:48 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s6sm3941116ejb.122.2020.12.04.14.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 14:57:47 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Dec 2020 23:57:38 +0100 Message-Id: <20201204225740.1506052-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/av1dec: Fix leak in case of failure 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" A reference to an AV1RawFrameHeader and consequently the AV1RawFrameHeader itself and everything it has a reference to leak if the hardware has no AV1 decoding capabilities. It happens e.g. in the cbs-av1-av1-1-b8-02-allintra FATE-test; it has just been masked because the return value of ffmpeg (which indicates failure when using Valgrind or ASAN) is ignored when doing tests of type md5. Signed-off-by: Andreas Rheinhardt --- I switched the av_buffer_ref() and update_context_with_frame_header() because the latter does not need any cleanup on failure. Also notice that actual decoding with this patch applied is completely untested. libavcodec/av1dec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1589b8f0c0..d7b2ac9d46 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -674,20 +674,20 @@ static int av1_frame_alloc(AVCodecContext *avctx, AV1Frame *f) AVFrame *frame; int ret; - f->header_ref = av_buffer_ref(s->header_ref); - if (!f->header_ref) - return AVERROR(ENOMEM); - - f->raw_frame_header = s->raw_frame_header; - ret = update_context_with_frame_header(avctx, header); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to update context with frame header\n"); return ret; } + f->header_ref = av_buffer_ref(s->header_ref); + if (!f->header_ref) + return AVERROR(ENOMEM); + + f->raw_frame_header = s->raw_frame_header; + if ((ret = ff_thread_get_buffer(avctx, &f->tf, AV_GET_BUFFER_FLAG_REF)) < 0) - return ret; + goto fail; frame = f->tf.f; frame->key_frame = header->frame_type == AV1_FRAME_KEY; @@ -710,8 +710,10 @@ static int av1_frame_alloc(AVCodecContext *avctx, AV1Frame *f) if (hwaccel->frame_priv_data_size) { f->hwaccel_priv_buf = av_buffer_allocz(hwaccel->frame_priv_data_size); - if (!f->hwaccel_priv_buf) + if (!f->hwaccel_priv_buf) { + ret = AVERROR(ENOMEM); goto fail; + } f->hwaccel_picture_private = f->hwaccel_priv_buf->data; } } @@ -719,7 +721,7 @@ static int av1_frame_alloc(AVCodecContext *avctx, AV1Frame *f) fail: av1_frame_unref(avctx, f); - return AVERROR(ENOMEM); + return ret; } static int set_output_frame(AVCodecContext *avctx, AVFrame *frame, From patchwork Fri Dec 4 22:57:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24349 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 94E86449E05 for ; Sat, 5 Dec 2020 00:58:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D9E468A5DA; Sat, 5 Dec 2020 00:58:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6535568A5AC for ; Sat, 5 Dec 2020 00:58:05 +0200 (EET) Received: by mail-ej1-f68.google.com with SMTP id m19so10952061ejj.11 for ; Fri, 04 Dec 2020 14:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=ipgT7KIxMgHW3dm6nMULqKxR6ZkSLDN3jSJq7jYGplI=; b=owxLzc7NpYRgbCJ5toVCs8ElfnVC26sZlx1f8mkCqNZBO6OxpFM44+8p6PpvBhnXEJ y8HdeOapNjpyAwaDQbrZgZz4c+n1OAoY5+4a3kFksb40ypjPCOtVimgL+lt1iGBel+T8 DkXnuJvlANyxmAL1w5vnZa+jZrTiwQduj+QOzkLEWd8ERVqaMefZdQsDq5AeCaR/CM0P JQTZC/devZMLo0SFOtbO4Uu37f4N+VjO041MwoYFuiCO384yNCctl95wAC5p/nZIcin5 cB1CIplmQ/ktRExJMpT7XuFYE6xbVghppf6ZelK+JQRLwMJqYliA0IABiS70/DFa/iKI IJWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=ipgT7KIxMgHW3dm6nMULqKxR6ZkSLDN3jSJq7jYGplI=; b=jftaSPAhS6bnrzB/PHcmAJyzstnsDCdPWMKzPu41M0F/xDUKO8hKO0u/2dshcXn6cE pO6G2rfAi/hjs8fiq2r6wH9vm0q3X4jLWOcUdpXjPfmAMgYw2BMiAIS6D47MkpURJQ05 QHqTfqiw8sznX+MqqdJs6FJChL1e2OqXuznf3m9xcrmy74EqLXZjsTlBDqQc9+SY5P7/ +DdKHlF/SNLupcK4KIPeL/mTJEPQ5xK9iUIIS68QqIO/E/TsGy7L7SpSbWGnK/ZYAU32 ReNG1Nxqptd0LqPqeuRfPXXsvtp4UBjNo50pvCGjlL+T8b132jrZn05i8OGur2Kq9v5D tDIg== X-Gm-Message-State: AOAM531JggIXHiOr9CO9RiVrKgTgWDA4eZrng5v2QX++zZwK2LOIeEH6 2vJj1tpkGeUZ/bBc3NsHkGsXZYU6T30+2A== X-Google-Smtp-Source: ABdhPJyiSJ6ZR4rFQhV2ZEqkmddUI/2+CDxt3JsoioA5caWCp35PcKzB8/pr0EmMvZT7AwZPwsUqBQ== X-Received: by 2002:a17:906:af79:: with SMTP id os25mr9319361ejb.275.1607122684551; Fri, 04 Dec 2020 14:58:04 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s6sm3941116ejb.122.2020.12.04.14.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 14:58:04 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Dec 2020 23:57:39 +0100 Message-Id: <20201204225740.1506052-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201204225740.1506052-1-andreas.rheinhardt@gmail.com> References: <20201204225740.1506052-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] fate/mxf: Fix d10-user-comments test 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The mxf_d10 muxer is very picky regarding the input it accepts: The only video accepted is MPEG-2 with absolutely constant bitrate, i.e. all packets need to have exactly the same size; and only a few bitrates are accepted. The sample file used did not abide by this: Writing the first packet (a video packet) errors out and afterwards an audio packet from the muxing queue has been written. That's all besides metadata (which this test is about). The FFmpeg cli returned an error, but said error has been ignored by the md5 test. This commit changes the test to actually send a compliant stream to the muxer, so that it does not error out; furthermore, the test is changed to explicitly check the metadata instead of it only being implicitly included in the md5 checksum. The compliant stream is created by our encoder at runtime. Signed-off-by: Andreas Rheinhardt --- This test needs to be fixed in preparation for the next patch. tests/fate/mxf.mak | 8 ++++---- tests/ref/fate/mxf-d10-user-comments | 26 +++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak index ca119fa677..467357ed2d 100644 --- a/tests/fate/mxf.mak +++ b/tests/fate/mxf.mak @@ -45,9 +45,8 @@ FATE_MXF_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-u fate-mxf-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf fate-mxf-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -metadata "comment_test=value" -fflags +bitexact -f mxf -FATE_MXF_D10_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-d10-user-comments -fate-mxf-d10-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf -fate-mxf-d10-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001.mxf -c copy -metadata "comment_test=value" -store_user_comments 1 -fflags +bitexact -f mxf_d10 +FATE_MXF_D10_USER_COMMENTS-$(call ALLYES, FILE_PROTOCOL MXF_DEMUXER DVVIDEO_DECODER SCALE_FILTER MPEG2VIDEO_ENCODER MXF_D10_MUXER EXTRACT_EXTRADATA_BSF MPEGVIDEO_PARSER PIPE_PROTOCOL FRAMECRC_MUXER) += fate-mxf-d10-user-comments +fate-mxf-d10-user-comments: CMD = transcode mxf $(TARGET_SAMPLES)/mxf/Avid-00005.mxf mxf_d10 "-c:v mpeg2video -b:v 30000k -minrate:v 30000k -maxrate:v 30000k -bufsize:v 30000k -rc_init_occupancy 30000k -vf scale=w=1280:h=720 -an -metadata comment_test=value -store_user_comments 1" "-c copy -frames:v 5" "" "-show_entries format_tags" FATE_MXF_OPATOM_USER_COMMENTS-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-opatom-user-comments fate-mxf-opatom-user-comments: $(SAMPLES)/mxf/Sony-00001.mxf @@ -56,7 +55,8 @@ fate-mxf-opatom-user-comments: CMD = md5 -y -i $(TARGET_SAMPLES)/mxf/Sony-00001. FATE_MXF-$(CONFIG_MXF_DEMUXER) += $(FATE_MXF) FATE_SAMPLES_AVCONV += $(FATE_MXF-yes) $(FATE_MXF_REEL_NAME-yes) -FATE_SAMPLES_AVCONV += $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_D10_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) +FATE_SAMPLES_AVCONV += $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MXF_D10_USER_COMMENTS-yes) FATE_SAMPLES_FFPROBE += $(FATE_MXF_PROBE-yes) fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes) $(FATE_MXF_REEL_NAME-yes) $(FATE_MXF_USER_COMMENTS-yes) $(FATE_MXF_D10_USER_COMMENTS-yes) $(FATE_MXF_OPATOM_USER_COMMENTS-yes) diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index de4f26c6f8..a2fae7ec01 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -1 +1,25 @@ -68f0fa62b6a676894afbbe4c34ebf70b +eea0dd8376b059d41a3063064d3ac811 *tests/data/fate/mxf-d10-user-comments.mxf_d10 +3782189 tests/data/fate/mxf-d10-user-comments.mxf_d10 +#extradata 0: 34, 0x716b05c4 +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: mpeg2video +#dimensions 0: 1280x720 +#sar 0: 3/4 +0, -1, 0, 1, 150000, 0x0547870d, S=1, 24, 0x5aa90ad0 +0, 0, 1, 1, 150000, 0xe80a1612, F=0x0 +0, 1, 2, 1, 150000, 0xc5c50e2f, F=0x0 +0, 2, 3, 1, 150000, 0x51e28a04, F=0x0 +0, 3, 4, 1, 150000, 0x9bbe6feb, F=0x0 +[FORMAT] +TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010900 +TAG:uid=adab4424-2f25-4dc7-92ff-29bd000c0000 +TAG:generation_uid=adab4424-2f25-4dc7-92ff-29bd000c0001 +TAG:company_name=FFmpeg +TAG:product_name=OP1a Muxer +TAG:product_version=0.0.0 +TAG:product_uid=adab4424-2f25-4dc7-92ff-29bd000c0002 +TAG:material_package_umid=0x060A2B340101010501010D001300000000000000000000000000000000000000 +TAG:comment_test=value +TAG:timecode=01:00:00:00 +[/FORMAT] From patchwork Fri Dec 4 22:57:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24350 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 0F814449E05 for ; Sat, 5 Dec 2020 00:58:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6FF168A606; Sat, 5 Dec 2020 00:58:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 219CA68A5AC for ; Sat, 5 Dec 2020 00:58:06 +0200 (EET) Received: by mail-ej1-f67.google.com with SMTP id qw4so10956520ejb.12 for ; Fri, 04 Dec 2020 14:58:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=Y9dqU1PH2WFrzFIwqfLelpk15MlVyJhrB+wNELwvTHw=; b=GtOOKssD0snjxwCLAXAgmCYevT3JwWby72vqiAcbZ+PabOwjseevkgI0qzXAkBdK3u GUfZN+aefCUX3uI4n2ZR2bPlqCGNuIGJJ8IcymOiEcjBSYTr6+pp0oyoqEdXCMGCt27Z IEsga90hvefdpwGudEt2C68CbDAO66cG0T9cDzJgElNAWYP5b8OElmCU6erkOEA24TZ9 cp7WgEql6fx9et87LkGnp4QW6xslb/HJaDSUnqoeSMSlxxZc2rkwhqayMxC96fc72Axy 7v4YO4ysKrArnQBKdQc0NRbvhNaQRV3CXEmN3YnZh1iMPHQ6CCFJnHtRFmVUwj9y6nHk Bwtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=Y9dqU1PH2WFrzFIwqfLelpk15MlVyJhrB+wNELwvTHw=; b=lHOoOc4Fpu5J89al5I2EBcq7bWjN+sdYH/yDXuD+7SN6iQ/qb9LhLr1VkHGm8yO5eo rWXlLGEm0WPlS3Fee8PH8ezOGLDMSxKvDEwQgu07qpNr7OAeG5n5b5bcxHwUotz0JU6x +debco8m7y/tgNyIToN5Fvp4EGgdVKaxjuqmNUqAqMla8rfLWjt3zGDd8ORsdrLQBfF0 dNFOJKVX8YPZMxeFZ91t30ZI6NhyXXxtHh0QuzCOwDpsj/ad/TiZfy1393WAqzh4O1++ ShD6TNGTGMo2y+AD9xHqwoPbkHzsMPsPTdRf9WK7FhhB0aA8SyG0BdAtoLrvk0az4eEL edzA== X-Gm-Message-State: AOAM532XSkaWaUdij3+P3QQGcYgYWnxgK9FuxhqnDk1HqL7985AL/1xh d00I50x0aV+YvbKTiaJE2FWnJbCLZKUQIg== X-Google-Smtp-Source: ABdhPJy4UOSckGActbzD5UpBxTgMqKXuzd5IudVS70++YsBqxSMkfPCxeEBWpy65ezdLyUgtt1HQLw== X-Received: by 2002:a17:906:1a19:: with SMTP id i25mr9172346ejf.206.1607122685425; Fri, 04 Dec 2020 14:58:05 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s6sm3941116ejb.122.2020.12.04.14.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Dec 2020 14:58:04 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Dec 2020 23:57:40 +0100 Message-Id: <20201204225740.1506052-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201204225740.1506052-1-andreas.rheinhardt@gmail.com> References: <20201204225740.1506052-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] tests/fate-run.sh: Don't overlook errors from md5 tests 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The md5 test up until now ignored errors from ffmpeg (the cli) and just md5'ed whatever ffmpeg has output; while testing scenarios in which ffmpeg fails has its merits, errors should not be overlooked by default; doing so also reduces the effectiveness of sanitizers as errors from them are ignored. This has happened with a memleak in the AV1 decoder. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 58d5fdbb60..b69176f7c3 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -158,7 +158,7 @@ md5pipe(){ md5(){ encfile="${outdir}/${test}.out" cleanfiles="$cleanfiles $encfile" - ffmpeg -y "$@" $(target_path $encfile) + ffmpeg -y "$@" $(target_path $encfile) || return do_md5sum $encfile | awk '{print $1}' }