From patchwork Tue Oct 17 21:12:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5602 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp631993jah; Tue, 17 Oct 2017 14:12:52 -0700 (PDT) X-Received: by 10.223.176.50 with SMTP id f47mr5131782wra.185.1508274772495; Tue, 17 Oct 2017 14:12:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508274772; cv=none; d=google.com; s=arc-20160816; b=Md7yJND1pDAhuHaX+lc+SXQ2sD3vLlMK30JtTTvNpJem1CJuaEHyGbEtbmtBQ6Zq27 BR6qC+BHPjvhtaasSLklCV2GbSUaGJGuMfg5mkwxsvmPa8cZsEd61LuzUdV5ANekFkKs Zx/qM99ObUPPpuMG8w03yjUy31AcuX2vRfeo91TVdTDy/rdGGyOCdEaP+/eMeBX8Chr7 7HvJK/oNqQhWsb959UvX6N+2alwBsF3chPsl3c7laBVZZlYblRN5L1mfd75MZTv03rn1 SJItAYmUKnEeJUQVKPx13NpusGFG0CTKP3/OXCLxrtc2wbtT+tupBqzhkiyudSZb7VkI S6lg== 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=sc2aVaVWZEFrQj2xzOUIEHJyxZ3b6ovTXUOl7P2XlQ4=; b=Wm/LpvUFBNUgnztptPPOsWkE12fYbfF+JNAI88r22QiRBmrwTdS2b58rcaNIPHoVm+ X/tA8D96h5Yh3VYwzZ4N9jylvTo7IwXbz8PNcrZyBMdMPDDm8og9TgwH5WqWjkbSTFzn VDFWzPZoZ6Tnki8e/mhC1jTMDJKAxgahLpJx79AsKIM1IaaLi8xjxROPHB0Efr56w/96 kgx23mmQlBhf6ODQ8uhMtjEPc6D6BtX2cEry68yWSDar1JykmOamM+XNJjqjuOtg5PYn 4UPabqedLF6LCDto+yZbkR/BcysjJQ+v64J+nUVKXf6PlOH4MYyebL39xvrUlvjS5Htp LYcg== 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=JUYGQd6R; 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 u2si9134265wra.454.2017.10.17.14.12.52; Tue, 17 Oct 2017 14:12:52 -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=JUYGQd6R; 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 96623689EFE; Wed, 18 Oct 2017 00:12:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF10A68997A for ; Wed, 18 Oct 2017 00:12:29 +0300 (EEST) Received: by mail-wr0-f170.google.com with SMTP id l1so3056208wrc.3 for ; Tue, 17 Oct 2017 14:12:34 -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=Z5YWo6c+i4mqb40TLvkmCorViW3sxQ84eUV5r42Hm6U=; b=JUYGQd6RTKqJ/CJiTIZjAQ3yHcxn3kL/Lg00H5+ZZUcJLJstVQH91kz8Nfitfc0bD9 AxMv1inVSETo+u4eatjpj0k2rNAzeipCo73Kwgmy3DYPtQ3j5yj1BRJIS+95yzLoVHnY CEMGqpHbw/6StorXAil3IatRlp6zgdUz34WE/MSez8ZE++WmNOof3pczAeAtQPbgHhbo OFSJzZujjquZFcWO6PJAJ2GwgQ1sNH3e3gJJ1YOlane/z8E1/C9dny7GSTywc+eYFrZd oT0Aa9nwheF8U3ND0bi4iCX+GiIZd9HSybfh/1zjoNNi/Z3rx+BNzPH+1z7DfGN15CUU XHcg== 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=Z5YWo6c+i4mqb40TLvkmCorViW3sxQ84eUV5r42Hm6U=; b=c7hsKKB3Qe17EBKT+VUKOmJVyCe6OOXTSEd/DoGFxqL/RkfgZLZURSKDEjMC83xsep b5nyoRd/RtjS2zu3kGB6A7WXsem/FbNr5TmfPYvGQUrSG0AGLSD2GzIlqiL2Mh1wQf+x YBM77mim7FEw7My3imzQElXtxW+WK61BW+oduP6wjvvUYXoA6hR9xaD4O6dd4pmf+JOL u/FqGYI0Mk85kr6em9CE1twO7/b0LtCbyEXxpW39uA/aPN3w545TzMhiUqmynPL/gzP2 VARpY1L0VB6Itv7oeR90gPF+7ycItTc7FiVluC+pK1kGt3UhJYgOKodIzhskPcKQZc2p ru/Q== X-Gm-Message-State: AMCzsaXtnyZKM83SGekI3m+n8XycB9O4ZWAum+6BVG80IqXD3nrq1fk7 CsppsgmPyxe9VhSbN2RF0E2p7M7B X-Google-Smtp-Source: ABhQp+Rs7HSLPxtMfsyt4Qck2JFVXjF/xAR0pHBbW3JJpoeJ1KDKDf4O5HcPpvo8UojAUR/NRr5oTg== X-Received: by 10.223.141.139 with SMTP id o11mr4511069wrb.20.1508274754158; Tue, 17 Oct 2017 14:12:34 -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.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 14:12:33 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Oct 2017 22:12:21 +0100 Message-Id: <20171017211225.3175-5-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 5/9] wtvenc: 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/wtvenc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 4a68b8133f..d4a08dda61 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -462,12 +462,15 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) AVIOContext *pb = s->pb; WtvContext *wctx = s->priv_data; AVStream *st = s->streams[pkt->stream_index]; + int ret; if (st->codecpar->codec_id == AV_CODEC_ID_MJPEG && !wctx->thumbnail.size) { - av_packet_ref(&wctx->thumbnail, pkt); + ret = av_packet_ref(&wctx->thumbnail, pkt); + if (ret < 0) + return ret; return 0; } else if (st->codecpar->codec_id == AV_CODEC_ID_H264) { - int ret = ff_check_h264_startcode(s, st, pkt); + ret = ff_check_h264_startcode(s, st, pkt); if (ret < 0) return ret; }