From patchwork Tue Oct 17 21:12:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5600 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp631760jah; Tue, 17 Oct 2017 14:12:36 -0700 (PDT) X-Received: by 10.28.19.73 with SMTP id 70mr4506293wmt.87.1508274756884; Tue, 17 Oct 2017 14:12:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508274756; cv=none; d=google.com; s=arc-20160816; b=TkYwjxvFjPKPTfusJQRTa6T296n/2G5902DdFPPc1CyiesOwd7C2emaCHYIv2cZUMX FIIpNpDRk4X1j+d5YMeYIkw5o26dPb9SISfFKg8iA4a+yzb5HB1NrgX9+Yny34QDNMwR znUbJncg/1cgKQ/GrsGkq0RI7ZfgoN3m2Rxbjapem/+BBZJJlGElxt3Fs7LvnogVh704 q4M5BNM9oE3ovt4ywmT+ukOUxwzoqNLwT3NvMTNlAK5xRug868FhJxjJhKOooYxwNQ1X XL1RSIam3c/Lg43xUAR5kXZ/wiQcRJSLj2dSVknfzv14AeE+W+ZnqbzDZYQg4bTEnBgF 6++Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=OdGkPRhEKrfUmQWTN4yGeH7EXQgUB6e73d+vKZ+tx00=; b=mjt9/0uJmcpNKC7tRg3aCuvQVjUlSPlzZdeP1fwCSPZ5SyHWz4k5NilGW9r18LBi9x U+pga0PPv9P+sy/QXVNeY59rxhZLCP2hUwjPAn9asRimX22h9IlkKw+ciSzoYk/m3j7p 6cHwaB2qz1J6IgsMIVq+yM7+wL4yTCfJnhFW1ykEGevVQwr+RMgg7Eu6dShQU8wlWkya NshqfIDXkmYT8kq4CQ7FqVJFkNz58fJlEyQLFhGemrb2WzfuXlx5+McFh7wBXepF+IJH TaOu79ELfgLhFTHcjOfedp9QL5NuWyVmr24C846JUnGyI3w89f7qINyhE7mAiNuiFZ1+ QaTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=NGAVN+LT; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z48si2784615wrz.49.2017.10.17.14.12.34; Tue, 17 Oct 2017 14:12:36 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=NGAVN+LT; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B6FED689E0C; Wed, 18 Oct 2017 00:12:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f169.google.com (mail-wr0-f169.google.com [209.85.128.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 884B6689BC9 for ; Wed, 18 Oct 2017 00:12:27 +0300 (EEST) Received: by mail-wr0-f169.google.com with SMTP id l1so3056099wrc.3 for ; Tue, 17 Oct 2017 14:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=wMzFvBX1Kw+IjJF+4tQAaAXLoOze4BF6U3BLoV9suNA=; b=NGAVN+LTzKLk+I0n3DTokcn3FDOLKo+36lWaxkuXoBu2vE308ONIVbvU4Zkbn/Pnqx dPqRHiD644rEReoSzxLiglkQOE3m2MfAKNTgJKZYCBcBM/cC/wPP9ANyrYj2gIx3PYpF A3JliG3XsoDk+IuiNU1XgOWYwXp1V9Em1IhuymkB77ZJPeVkgInNIt0WMwSAB1U0rdWO mOSq77y7taluDYqUPsv9Tuuiuum20sS3J+q3dT2sCRYG/dBn4jwpbTLs9aEjs0ADGlJj 09xeZFHWIOe5Cq+9xODG5dIC/1bgOmudYK7Ph2UPbzFInGiQC783ncMIVQ2u/+bPj1EN 6KTg== 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; bh=wMzFvBX1Kw+IjJF+4tQAaAXLoOze4BF6U3BLoV9suNA=; b=jwXHwpKhqCERKNbXJ+xQ319eS7XZdkRmQRro33truofw7NYDIXn91r9ymoahJmsJb1 BUk3nprRvXmAmrmPNumJTkMeQRwEVblktpHZzVO0xHtrBxXpLXcxiT6le6Wb9f7ig2Hl EPqiBMfxwRWn+Re5l/oResfrAt7mAIMCgSu8/aTAI5PGUILdKX9P9JJqT1V+JnBPsR5s 2/wvOlDAVSWVe3ylIsIH7FxBZNXNmXTsuUrDjjsqKZ0EFuL5AGaZTXejYKntfbTwNZhh BlYKFvHGgmpgfgJNKrdPAuj+CzQlroKnyUdUpA6AidKjm9HyIdOJoW2/bDdffDCWPmyP 2HIA== X-Gm-Message-State: AMCzsaWmH3wajIj9JUuvncXvTKnKhFlCY0QzpVykoJSJaQKuHEXHPt6Y vyS/nnx7Lt7fuk3MRHVe0iEDzLSw X-Google-Smtp-Source: ABhQp+RRiN3GZmgJg8IWalG/ZXDRtobzqIDVS8M5Ezzs8owgj8MMPB8XFna5Kg2bM6j5CvkZ60fa+A== X-Received: by 10.223.128.170 with SMTP id 39mr4555602wrl.236.1508274751742; Tue, 17 Oct 2017 14:12:31 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id m25sm10810335wmi.7.2017.10.17.14.12.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 14:12:31 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Oct 2017 22:12:18 +0100 Message-Id: <20171017211225.3175-2-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017211225.3175-1-sw@jkqxz.net> References: <20171017211225.3175-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 2/9] apngenc: Add missing error check 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/apngenc.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index 77c1c916c2..16ead54cc8 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -217,8 +217,12 @@ static int flush_packet(AVFormatContext *format_context, AVPacket *packet) ++apng->frame_number; av_packet_unref(apng->prev_packet); - if (packet) - av_packet_ref(apng->prev_packet, packet); + if (packet) { + int ret; + ret = av_packet_ref(apng->prev_packet, packet); + if (ret < 0) + return ret; + } return 0; } @@ -232,7 +236,9 @@ static int apng_write_packet(AVFormatContext *format_context, AVPacket *packet) if (!apng->prev_packet) return AVERROR(ENOMEM); - av_packet_ref(apng->prev_packet, packet); + ret = av_packet_ref(apng->prev_packet, packet); + if (ret < 0) + return ret; } else { ret = flush_packet(format_context, packet); if (ret < 0)