From patchwork Mon Jan 27 08:28:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17581 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 4C81344B206 for ; Mon, 27 Jan 2020 10:28:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D43468AF81; Mon, 27 Jan 2020 10:28:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3B1468AF42 for ; Mon, 27 Jan 2020 10:28:29 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id p17so6021372wma.1 for ; Mon, 27 Jan 2020 00:28:29 -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:mime-version :content-transfer-encoding; bh=NeVgT0OrdDYiVuVSQC36BMjiyXFAcn8LXdg91fujYBg=; b=szl6IuHwdwMtEqrOkEdqle2fWxjo2640L/i/5zK7kKiDatWMoHYTaxegB4ZEez02N7 V5F0PMITj1adwbmM6HtW+H24eCrnL7WtjpnyFxFgTmQHnVDIoxvv8+RDDkBKR76aX0DS cqQiZgQ7zBdlJH56SqOLIRi0Wdw0SUec5S8po/HSqWO90kmkMZJhxsmwye53VCPz0Sa9 Gm27+IQM7haGOASN1K53bKHSzIYibZSLW088+sxQEC6G0U/UZT/zkK5d8cS/gtmJSN2O wwGf+In1MdrFd6YsfltJcofJWyT3KPSEeFTZbWqM2W1CHCf009YfNyekPifP4e08tiDl gb+w== 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:mime-version :content-transfer-encoding; bh=NeVgT0OrdDYiVuVSQC36BMjiyXFAcn8LXdg91fujYBg=; b=Rh0M9eguHtQhdNk8xTTzXk0SDo8LxNO1j1VIzjYCEDVNOXAVVXC3tmMCEU7HxFum+y pWs8BvL6mK8Jlp9ec3dAkjIJ/3r309p3s8zAqgOPbC7mTi6sminQYicmJ3zuEhVvTBDv cJalONkVaSA9zyv3AFgdYDzCHpS/b2i5zpeD2qKuuXZucR3j3RRdG8texdREJTG1eDfu iIePPpEACCMFQ83YhjyOPI/CSrESdXXYZopxifPLF4f4PqI/30WJI/DbxVSLpthBLdFs Rq7f9rg01hI2MrR1XdLaGwCsjBhwMlETVxStHDfvaGmj0TwTyvcvZRDo510rah4UBy+R xCdw== X-Gm-Message-State: APjAAAWVi8ZLGahc1uL1NRZsFM+m1XZlkX4+ejZZXxvgQHBsgDGjM1xm jAgS9hAH6YOvlp1uu5aMdxsqHACJ X-Google-Smtp-Source: APXvYqyX0vkJH+xF+1iigjN1UbZFa2yIRt3z9zw/Q+lai5cXSD0fcz/C17Th5uk94F4zu5RmIwI3IA== X-Received: by 2002:a1c:bc08:: with SMTP id m8mr13048040wmf.189.1580113708823; Mon, 27 Jan 2020 00:28:28 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o2sm16974156wmh.46.2020.01.27.00.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 00:28:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jan 2020 09:28:18 +0100 Message-Id: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: Free encryption data on error 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" Fixes memleak and Coverity issue #1439587. Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 589576b529..7b7d4f43fa 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6329,8 +6329,10 @@ static int mov_read_pssh(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (version > 0) { kid_count = avio_rb32(pb); - if (kid_count >= INT_MAX / sizeof(*key_ids)) - return AVERROR(ENOMEM); + if (kid_count >= INT_MAX / sizeof(*key_ids)) { + ret = AVERROR(ENOMEM); + goto finish; + } for (unsigned int i = 0; i < kid_count && !pb->eof_reached; i++) { unsigned int min_kid_count = FFMIN(FFMAX(i + 1, 1024), kid_count); From patchwork Mon Jan 27 08:28:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17582 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 5D92B44B390 for ; Mon, 27 Jan 2020 10:29:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4491B68B096; Mon, 27 Jan 2020 10:29:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C5FF68AA7B for ; Mon, 27 Jan 2020 10:29:01 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id t23so5844869wmi.1 for ; Mon, 27 Jan 2020 00:29:01 -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 :mime-version:content-transfer-encoding; bh=DnPLchbP1zO+shhZ/mb89cneT0rhjVaGro1gmAMLZ8k=; b=JbMskj3v3E/xa12Q2OqHou5lgPigB3/f+n7PDGy5EOzjrRsHWluSXbeh7szSv7bmuj 9XBSg/1lj/J5BHjT+FxMRlL9qO3FcGzsanLoXoSyUeiDaifkcXKt4Q+GvOg9lzvlFfUS PWmYWqBNGx7Vx55nP/LZSjWBHRvskCTGBJbBj+Pe7V6xL5IzQdiC5jC5z6ky67ETTMcB 426i5U2/zIeZ6yl8/2RT4LCJI6vbIDptpA7rMPa6HfUfUnytRdM053MwCU2zIrQDNtgO gomLSPRv9cH1ZtxQ70U9yZdqL7KoE+K/qQ0EuDX5NcerqbHrrdhN022CJUzBgqhjVsd1 va0A== 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:mime-version:content-transfer-encoding; bh=DnPLchbP1zO+shhZ/mb89cneT0rhjVaGro1gmAMLZ8k=; b=aqmejjDKLJGNhngwkGvDr0MwZTQoOwuMDBsQEGUohd7QbJ5WYPkb39SVVZ+VFFVC4h b4Qo9BUFfV2GOADpULpGNLEriRpP5n2GWUXLPbyVKmwMzmXxDJJkDNDBS1S7MfXYyJh/ 2NeFPqnkvLpMvijnry6QqQ1EH+d1lBdcOTIOxZojxkx/7n4ByLd2nWIoHkDi4yijDiLa 8JBn8DjITVHT2te+r+Ymh5cjVRSjQoWc5OckT77vDq/WrFGjeF33/VF7eWto1xCdXTRQ uCHDIhRtrn0ikndiKOENsN9GqFG0sNhfc0e1lrhus0/G1omq4ap3SpoKLp6d2Vj13rpa n0iA== X-Gm-Message-State: APjAAAXoDZEX4qaT+/oFBRs7rU+vn1K2Aud0ez1xzVtWbH7HM01K3zD0 PVYYy09lvOYcWof+mnc6lm4Am3+a X-Google-Smtp-Source: APXvYqyGSNB/WVAHXHU9IigaDVU+HHutEs9zJWVffQtekjmESI9rtEYWeAM7Fkkjtjq3aqVYuBiBHg== X-Received: by 2002:a1c:2282:: with SMTP id i124mr12022520wmi.109.1580113740424; Mon, 27 Jan 2020 00:29:00 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o2sm16974156wmh.46.2020.01.27.00.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 00:29:00 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jan 2020 09:28:19 +0100 Message-Id: <20200127082821.22770-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> References: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/mov: Don't leak MOVFragmentStreamInfo on error 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" Fixes Coverity issue #1441933. Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 7b7d4f43fa..50b8ccb02f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1327,8 +1327,10 @@ static int update_frag_index(MOVContext *c, int64_t offset) for (i = 0; i < c->fc->nb_streams; i++) { // Avoid building frag index if streams lack track id. - if (c->fc->streams[i]->id < 0) + if (c->fc->streams[i]->id < 0) { + av_free(frag_stream_info); return AVERROR_INVALIDDATA; + } frag_stream_info[i].id = c->fc->streams[i]->id; frag_stream_info[i].sidx_pts = AV_NOPTS_VALUE; From patchwork Mon Jan 27 08:28:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17583 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 576AF44B390 for ; Mon, 27 Jan 2020 10:29:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 423B968B0B5; Mon, 27 Jan 2020 10:29:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E77F068AF42 for ; Mon, 27 Jan 2020 10:29:01 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id c84so6027364wme.4 for ; Mon, 27 Jan 2020 00:29:01 -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 :mime-version:content-transfer-encoding; bh=2jtul1TsLuVIMXjFE7HTHwH93vI/Yjk2YrTW3C7uHYQ=; b=jq6izbmtPAKjgCsBzpjVD3aj18iw4Mh94JrZSPLmHu+YybRCP3iyNCwxE4Bj4DGN2R xTWHLD9cXPouYmhH/pnMjzXwUxdT+hG27vxXZH684fATA6GOVlNa2Ozlvf4/bBuM7mdb nC7nSwMjTnyNtWOF7QiM2XgeN/4atPw8xmWZRIgFsrbZhlyV6K+D4tCWcWIC9oaEiUe2 sarM6GcvqADr8pvXOBw9gZ57K7GGg5U5A9+OSP35EnBJApPQkKNTtM0xP1xmdwE2C+7r fSfWCIqijNI2evgbTIH/nzpnYKPXp4g3IAvXU02u2UNsus0/V1XP4SvI2NwLFDEakXwS F9zA== 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:mime-version:content-transfer-encoding; bh=2jtul1TsLuVIMXjFE7HTHwH93vI/Yjk2YrTW3C7uHYQ=; b=ad7jxLAhjInz0dNxnVdI+QupQftEOvAy2jUITWL2lKQyMXcsx7qGZRQZZeifSsLG86 o1vPQrs3yQdt5SFdrxOS5GCSo2TrCjxNfAZHmoysz/IcHNpODpDgeDbtBsx+iXs/xji6 kTpJD6CArOmZFSvmf4CJVQ7pzNZUiazwWPmtMygPex3x5WQUBx4D2rIOyNOcmtvcsYfq tRVAsz/SmquZSbdNAF6SZfmBVo6Neh6NRF7Zrt252HLaFVDyTEFVDFXBFu0jygRqvoWG VVAPnobJXzfJfaKsKwsE93G7zXgRthDLWbNDCXKtR3RtgLbdVozbz+7EQ25lUn/AOpla 8aJg== X-Gm-Message-State: APjAAAX67cQuOFUtWOr20fccYeAMyWmpCb16yOzya/6v++7S+66nhnJd 4oN7U1GTF6BJi5F5Dj4UGW1kpwDL X-Google-Smtp-Source: APXvYqz5DfHtZ6TdpDe6xcv39LqAbl+Et76xeSwc3PO8dsKxmgP9i4YW7xa3DxRhUlDvA/V0Q9zJkg== X-Received: by 2002:a1c:a952:: with SMTP id s79mr13066938wme.83.1580113741253; Mon, 27 Jan 2020 00:29:01 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o2sm16974156wmh.46.2020.01.27.00.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 00:29:00 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jan 2020 09:28:20 +0100 Message-Id: <20200127082821.22770-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> References: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/vf_paletteuse: Fix potential double-free of AVFrame 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" apply_palette() would free an AVFrame given to it only via an AVFrame * (and not via AVFrame **) in three of its four exists (namely in the normal path and in two error paths). So upon error the caller has no way to know whether the frame has already been freed or not; load_apply_palette(), the only caller, opted to free the frame in this scenario. This commit changes this by making apply_palette not freeing the frame at all, which is left to load_apply_palette(). Fixes Coverity issue #1452434. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_paletteuse.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index ed128813d6..255c9d79e3 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -903,7 +903,6 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf) AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) { - av_frame_free(&in); *outf = NULL; return AVERROR(ENOMEM); } @@ -916,7 +915,6 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf) if (av_frame_ref(s->last_in, in) < 0 || av_frame_ref(s->last_out, out) < 0 || av_frame_make_writable(s->last_in) < 0) { - av_frame_free(&in); av_frame_free(&out); *outf = NULL; return AVERROR(ENOMEM); @@ -934,7 +932,6 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf) memcpy(out->data[1], s->palette, AVPALETTE_SIZE); if (s->calc_mean_err) debug_mean_error(s, in, out, inlink->frame_count_out); - av_frame_free(&in); *outf = out; return 0; } @@ -1023,20 +1020,17 @@ static int load_apply_palette(FFFrameSync *fs) if (ret < 0) return ret; if (!master || !second) { - ret = AVERROR_BUG; - goto error; + av_frame_free(&master); + return AVERROR_BUG; } if (!s->palette_loaded) { load_palette(s, second); } ret = apply_palette(inlink, master, &out); + av_frame_free(&master); if (ret < 0) - goto error; + return ret; return ff_filter_frame(ctx->outputs[0], out); - -error: - av_frame_free(&master); - return ret; } #define DEFINE_SET_FRAME(color_search, name, value) \ From patchwork Mon Jan 27 08:28:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17584 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 3F45144B390 for ; Mon, 27 Jan 2020 10:29:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E2AB68B0D2; Mon, 27 Jan 2020 10:29:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEA1E68AF84 for ; Mon, 27 Jan 2020 10:29:02 +0200 (EET) Received: by mail-wm1-f46.google.com with SMTP id g1so5825799wmh.4 for ; Mon, 27 Jan 2020 00:29:02 -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 :mime-version:content-transfer-encoding; bh=H3iFi4ulbXhDEv/FK+gB35OPOROo19capWDO52RreVE=; b=IkTnbtmOyeAO3ChNyBxvYGU2WmzPpQEWoxXmFmNC9XHDtIQZwbWuYpFeiQQNleUr/a qs1nKvjESHE1lXvLnTFjdDVJKZto8MEusMHZNIljWkCkAYrV4W6l51oZ1EBh91sDaUgX 9EbAtKewcM1Di55/pLJ2jqEro/BNHQgVruMxUtuJWomvQNZJ1d/tKoxod9sSLDVceVGR H8fkT39vXdtroG4gOHfB7ulcawX1TQ5xWvP2dGsxhj7R9VTkTRATsIgPtLKaIYVrkGS/ B01TfijE9Lal+AkX8ShP7GSXeXeEpExiDMBu/uYW0o1O52da+5FnwO0FZ0uOzvTSxp5Q PhTA== 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:mime-version:content-transfer-encoding; bh=H3iFi4ulbXhDEv/FK+gB35OPOROo19capWDO52RreVE=; b=irl1eLbmoLjLoVDal/1mRcfDTmN2/Fj9VrPei6/yr0c4AqexuLACz/kG3uxQstkPUw dbI60HezRL8gmpZD/rv4ropp4cyFBONw8M3RZe/IuE/4SD+AOitNzoSvZwv5pZAwlVc9 OLSvsvBzzpGQ+hHVPhF+nqhf2+T5pVMq9x8Yx5w9tbZXKqqIJApvgoP3GiDphlzkUhyX M9J/n1gJQFWK/lk18O+ff2I3D04aRCzDsFVH86vfktTPy39RsY+C0VjITRZbaypoXQ0e kkz0A4Z9vLYwPeSxuLeH5WDu4WhE3SCFC/sArySCv5nm2RoGdmT7/ZCEZHxBK6FgWAt7 j8fw== X-Gm-Message-State: APjAAAU44M3rj3iGU3kIm686A0r8v2sEzoZhI2VQV2BnonM6k6+qhPgo AQwfZhfw6SnppyWgXH+UFN0qm/oC X-Google-Smtp-Source: APXvYqzGHyobsf3xRmS27qYSxhNgPtQ2VqE+sd9evbPcrwcD99baU1r83h7vDtb3qzW3q9bA5i7Nwg== X-Received: by 2002:a1c:9a8d:: with SMTP id c135mr12041279wme.183.1580113742041; Mon, 27 Jan 2020 00:29:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o2sm16974156wmh.46.2020.01.27.00.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 00:29:01 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jan 2020 09:28:21 +0100 Message-Id: <20200127082821.22770-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> References: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avfilter/vf_paletteuse: Forward error codes 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" Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_paletteuse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index 255c9d79e3..408cff786e 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -912,12 +912,12 @@ static int apply_palette(AVFilterLink *inlink, AVFrame *in, AVFrame **outf) s->last_out, out, &x, &y, &w, &h); av_frame_unref(s->last_in); av_frame_unref(s->last_out); - if (av_frame_ref(s->last_in, in) < 0 || - av_frame_ref(s->last_out, out) < 0 || - av_frame_make_writable(s->last_in) < 0) { + if ((ret = av_frame_ref(s->last_in, in)) < 0 || + (ret = av_frame_ref(s->last_out, out)) < 0 || + (ret = av_frame_make_writable(s->last_in)) < 0) { av_frame_free(&out); *outf = NULL; - return AVERROR(ENOMEM); + return ret; } ff_dlog(ctx, "%dx%d rect: (%d;%d) -> (%d,%d) [area:%dx%d]\n",