From patchwork Thu Nov 9 08:49:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas George X-Patchwork-Id: 5966 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1775184jah; Thu, 9 Nov 2017 00:50:11 -0800 (PST) X-Google-Smtp-Source: ABhQp+RRwDB0fMSLiCQ+mVrLPXsWI+6PzLD04zCnWyXTUHAvy1zqZAxR9Y+HLpu9Vw1U4Glsugn3 X-Received: by 10.28.23.67 with SMTP id 64mr2257319wmx.101.1510217411180; Thu, 09 Nov 2017 00:50:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510217411; cv=none; d=google.com; s=arc-20160816; b=uJhgEKzOSUj13XmW/5ZedaHoTgyaT+cOway9FpbuGxjNcvS1w4aGcK7+waZ/waWBo6 LP9o3IIkHcD6jRH4Yw1f7QMNJzV7qbdnY5FK9ZwQJ9pP9otvSB/mJgntp6uc8JP11V/w kMsX7g1LtU9M3FgSIczWGi9SIaXIiohMMYwvdgLGiaRBU9q79Qcq0sr5aBb1nOBTYNSo cXokA3sLHVKRt6aSmYoiLdYbnuxgPmxxxb4lIWWBNWSA4oTlhV0E7vvYvn1XDOeA/XuC SqKwoPZAZBP9FcUqDcmB1aKmV5hZt9qbCjlHfNMaXrvrAEv8vww1s9OrrjEkO8DMGUdE IYyQ== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=j+94FuA16eo/oTcrzydmPmEjFoQ5qL9sPv1BVaIgL8I=; b=x/S9N5MG5mxnSrKIdeDkFfVWkNXxYe+/sxCpdsRnwVYHr7rmWdTblWJDUffcMO150J C1JVZfnye6eZSvOnDk1Y7zACYpR1KFm/nfaL8q02DlDNrKjUy5WehMEXMHXpL5Xt+j50 gZaD1sZCfh49YZyiLomLjDWMqtAEKtNoO4W8RNoYyrIiD8MKkiiQuESsLhPnf9+XsAYs DhrJ4zbpCRIDaqa1RzXLq5KAsN6SMGcZl4/bxXIPQeLA/TYVk3Yq9w3l33r0lde5H51h phuMfiSnsEkc6zwpW6GGf5iDIw59KLif2EFVoEQLUNQb2pDOEza9pv3iLm73go+jniNo y5pA== ARC-Authentication-Results: i=1; mx.google.com; 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 j198si4872899wmj.105.2017.11.09.00.50.10; Thu, 09 Nov 2017 00:50:11 -0800 (PST) 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; 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 77536689D85; Thu, 9 Nov 2017 10:49:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from nef2.ens.fr (nef2.ens.fr [129.199.96.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5CACB689224 for ; Thu, 9 Nov 2017 10:49:50 +0200 (EET) Received: from phare.normalesup.org (phare.normalesup.org [129.199.129.80]) by nef2.ens.fr (8.13.6/1.01.28121999) with ESMTP id vA98o2ii012067 for ; Thu, 9 Nov 2017 09:50:03 +0100 (CET) Received: by phare.normalesup.org (Postfix, from userid 1001) id E2606E00D0; Thu, 9 Nov 2017 09:50:02 +0100 (CET) From: Nicolas George To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2017 09:49:58 +0100 Message-Id: <20171109084958.16460-1-george@nsup.org> X-Mailer: git-send-email 2.14.2 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (nef2.ens.fr [129.199.96.32]); Thu, 09 Nov 2017 09:50:03 +0100 (CET) Subject: [FFmpeg-devel] [PATCH] lavc/pngdec: fix av_bprint_finalize() usage. 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" Signed-off-by: Nicolas George --- libavcodec/pngdec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 20707f0ae5..1d72f9542a 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -524,9 +524,9 @@ static int decode_text_chunk(PNGDecContext *s, uint32_t length, int compressed, if ((ret = decode_zbuf(&bp, data, data_end)) < 0) return ret; text_len = bp.len; - av_bprint_finalize(&bp, (char **)&text); - if (!text) - return AVERROR(ENOMEM); + ret = av_bprint_finalize(&bp, (char **)&text); + if (ret < 0) + return ret; } else { text = (uint8_t *)data; text_len = data_end - text; @@ -862,9 +862,9 @@ static int decode_iccp_chunk(PNGDecContext *s, int length, AVFrame *f) if ((ret = decode_zbuf(&bp, s->gb.buffer, s->gb.buffer + length)) < 0) return ret; - av_bprint_finalize(&bp, (char **)&data); - if (!data) - return AVERROR(ENOMEM); + ret = av_bprint_finalize(&bp, (char **)&data); + if (ret < 0) + return ret; sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, bp.len); if (!sd) { @@ -1317,9 +1317,9 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, av_bprint_init(&bp, 0, -1); av_bprintf(&bp, "%i/%i", num, 100000); - av_bprint_finalize(&bp, &gamma_str); - if (!gamma_str) - return AVERROR(ENOMEM); + ret = av_bprint_finalize(&bp, &gamma_str); + if (ret < 0) + return ret; av_dict_set(&p->metadata, "gamma", gamma_str, AV_DICT_DONT_STRDUP_VAL);