From patchwork Tue Dec 5 23:11:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niki Bowe X-Patchwork-Id: 6560 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6269263jah; Tue, 5 Dec 2017 15:17:59 -0800 (PST) X-Google-Smtp-Source: AGs4zMY0UUko+fB3W8wmbN7pssHe6zOA9qVP1QK7ctY0qfHzkodcScwvQyHdX8PPqOEQ0k03yf5u X-Received: by 10.223.153.20 with SMTP id x20mr16105654wrb.219.1512515879708; Tue, 05 Dec 2017 15:17:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512515879; cv=none; d=google.com; s=arc-20160816; b=cdkMA7Io7HXR78IkG0qd5WsQ9m4cFIHM5eU77hwN7JWlHZU9faPmAuDktETS27fXtL SgFphMgSs40mwzjWPjlraLdfsGQD5ng1rcCd4AEMTLZ/XBHBr2nIN8G+2HoYgHqeh0+L 8m7d/yUgAdj9hiygBC+eyz68D9eju1ZFTxkao29wXKQsZVe1L++LXcK3ZY1fv0zIiPak QJ00tfl2IYPc/foDBbIMWRHkR0QrRjsd6jbyI5I2TjzCGcjRrwlaoASN1smNVWjQIvww kXavCY5TA68G8ALWLlEnICr+gyegVvLWqyguBJAZtvFOcRNS/WTVTiS4lhpNK1aAvtyc Ssfg== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=MX+ptuVAEVN5Bpseb8q5BKplmOhqOzPVZfnHv80OoGk=; b=Yd/ZbUMLiWn2ROoXD8sTJfbuRbmSL+fLOv5Cg+o0PJ9HCGK+4BsXH+MY2/zUVHjG9M nSNAodTKNTQhDB0RJ0Pq/XA0eLCr83nFgT+xYoQtnSjjWNSj6DaG4wWffcdZHo3M4785 SltuU2bdL7AI5ZVjPQ5BenkjavS9tv5cGxWAZhI8ERi9WPH7RZJ0Esq2+PhGIr4H6FJt x2H+7aVDmIoRg5N5ypXSwZ+qTI9NRkAXFJi7eLHefZ47NcYBcoJP0Hp59Le1F1ljnM0K ky3aujhQ4FttY/BHjUS9ZU3/mdcYb3KvmL/E35ngc+M/pDLKvz+IVvN6jGE4Gjq6jyjC L/Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=DTkuz87k; 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 e25si931288wmh.191.2017.12.05.15.17.58; Tue, 05 Dec 2017 15:17:59 -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; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=DTkuz87k; 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 7870D68A110; Wed, 6 Dec 2017 01:17:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f47.google.com (mail-it0-f47.google.com [209.85.214.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D8C9689F90 for ; Wed, 6 Dec 2017 01:17:45 +0200 (EET) Received: by mail-it0-f47.google.com with SMTP id m11so18684436iti.1 for ; Tue, 05 Dec 2017 15:17:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DmWYNX7hWMpfgv9YV4AcOPPWDeoGOOZo6kE0AE51nUE=; b=DTkuz87kE1Gg4PAXEz20RSzDMvej5aBgLVHQAYQOSpg+wgoUAk+tSNGL9c5ImazYAF Sc66wkSWkppMJI+MwENhoYPRLrURYSutIBnv9tTFjSn1RG+OWi/TvVSzGQp18W+iqEju ze1XkKYpXKOd1Q75eYTlRyBAtzPJARSKm4q/R2nvJM3X5/t/baL9oWdscfWy0SBg8pL/ DvW56ZxDpXqPUQ/OxTR3cuo9nX3IySy41GhMawmQExsska47RVS4gGZwMD3iXG8VgBzU BrB4O1q0B/Nus/sEql+k2tT8OP9wGhLE1nXlAwdaq5Qx99ncGR1jZxvrBgeRJqwsTqy1 ENFQ== 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; bh=DmWYNX7hWMpfgv9YV4AcOPPWDeoGOOZo6kE0AE51nUE=; b=GLp8uvDP3byElyod2Kq7YhKc3vadirMoj4w6EvqhXKHbc6I0QbKyZ8SQl6SeG9jX4/ gJam7K/8GX1b2lJuH4Qg8UqgT/X8WkBW14ojjXZpsOk2Fb6ggowloJcS4AH4S14WU/Yd 4EgPAOVobd16BBlElWxCtC0VQQ2mPNmzFCDqSt1q7KYqgOFnKXK2SGSE0L3hTkHY1GQC sveFi7sk6aM9SD6JIa+E0tOJ9vkX4v7v7qnz68LsCzsvTKz4t76OYCdiLCet2jhz8Tki gzzq6Hf1zpOQjZLgotdowVFpob6zYvxo0lC1OB6w+RxlkN7nN4OvnZLm2ahSMufTI0gh xfTw== X-Gm-Message-State: AKGB3mJ/NRjkhgJ+e41rvhsh2Oxpo1UIllgZNUKDX8kM2AagFJxqYAkC rY0pPt6HRg9skWPuLqDO0aikkANUczs= X-Received: by 10.36.145.203 with SMTP id i194mr11385538ite.73.1512515541698; Tue, 05 Dec 2017 15:12:21 -0800 (PST) Received: from nbowe.mtv.corp.google.com ([100.98.2.61]) by smtp.gmail.com with ESMTPSA id p124sm516894iof.10.2017.12.05.15.12.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Dec 2017 15:12:21 -0800 (PST) From: Nikolas Bowe To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Dec 2017 15:11:26 -0800 Message-Id: <20171205231126.97079-1-nbowe@google.com> X-Mailer: git-send-email 2.15.0.531.g2ccb3012c9-goog Subject: [FFmpeg-devel] [PATCH] Fix leak discovered via fuzzing 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: Nikolas Bowe MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/extract_extradata_bsf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index ed6509c681..d40907a675 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -78,7 +78,7 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, ret = ff_h2645_packet_split(&h2645_pkt, pkt->data, pkt->size, ctx, 0, 0, ctx->par_in->codec_id, 1); if (ret < 0) - return ret; + goto fail; for (i = 0; i < h2645_pkt.nb_nals; i++) { H2645NAL *nal = &h2645_pkt.nals[i];