From patchwork Sat Mar 10 23:44:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7899 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp120266jad; Sat, 10 Mar 2018 15:44:57 -0800 (PST) X-Google-Smtp-Source: AG47ELuiIz2xWAYISmXUjl0UPFal0Qx5bpHB0bcw7oFbwTzcGs8xQcQrHvmbdiUXfJl6rEXtPtKB X-Received: by 10.223.150.41 with SMTP id b38mr2477674wra.229.1520725497428; Sat, 10 Mar 2018 15:44:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520725497; cv=none; d=google.com; s=arc-20160816; b=Jj7t/mbuBrsG0Bsm4eB+rwZpEhgF9AjOMXvz1tRluj5eApawhfRCmX73yru+BSVVqT BI17YMjc1cqE4Eme9zaxgrDmgW+tPTCN1BoqOb4WW0HHp3+iyXAW6M7bv01AqE8gm1T8 86zZDw1rghzW3x/u4/4YpjWhLECcVyotrnVuavfJ4QKUdIsGtrxqkIfhG//+Yaod4Fdq qbtOFYj5ZroxkM0TkuC63OPtXl2Fgy1SM9rNFTDvp0PFMFY+0j4haaFLE/i2AW2sbi/B SGiYAjQ1xsn41saCXCK+rri+cCPFPArxDvQd7n64BGuvpPaP74J3CaMjSG+cODna5VAh IydQ== 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=rkEWmD4Gz2zkH3bUQZckr0ItoGOaQbwMLtgNM3cnqHU=; b=V5GA0qdHSV2wZfpewGRC9qWja/jc2gM+5QS3QHc5sZlyugeb3ZhqyaLE7jL8KmLMC5 NOnR0bze0cvvuCWCaiDhgbt0ccBvr6dBkTN9/KSH238g/rRko44QqY8LeO/TVHQDVHbM ScJ3VXglnnyY1y/VmwXeGuwuhgDqmwTf14abbcdQrTnScJC5dTQoUUMra7CEKwiWKAyO GNWiIjRgIrKscH7+KErJ+vc8PAWfasVEx6HOIQQkC76g2MdCuSQi2mYoq1tFLFVQfdEj E+i+dk/oF0xbkgIPSp1LDGeOm2nnzDeEgZwrssSYrldtEfc683UGYMm+pOcdiU5zUCw0 Op4g== 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 w18si3029619wra.159.2018.03.10.15.44.56; Sat, 10 Mar 2018 15:44:57 -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 2728268A24A; Sun, 11 Mar 2018 01:44:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 626E668A211 for ; Sun, 11 Mar 2018 01:44:38 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1euoAR-0007QX-P0 for ffmpeg-devel@ffmpeg.org; Sun, 11 Mar 2018 00:44:47 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id LPkh1x01Q0S5wYM01Pki4m; Sun, 11 Mar 2018 00:44:42 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Mar 2018 00:44:31 +0100 Message-Id: <20180310234431.6871-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avcodec/wmalosslessdec: Reset num_saved_bits on error path 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" Fixes: NULL pointer dereference Fixes: poc-201803.wav Found-by: GwanYeong Kim Signed-off-by: Michael Niedermayer --- libavcodec/wmalosslessdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c index 133a3e92d1..59e8929586 100644 --- a/libavcodec/wmalosslessdec.c +++ b/libavcodec/wmalosslessdec.c @@ -1148,6 +1148,7 @@ static void save_bits(WmallDecodeCtx *s, GetBitContext* gb, int len, if (len <= 0 || buflen > s->max_frame_size) { avpriv_request_sample(s->avctx, "Too small input buffer"); s->packet_loss = 1; + s->num_saved_bits = 0; return; }