From patchwork Mon Nov 27 03:22:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pan Bian X-Patchwork-Id: 6388 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1168016jah; Sun, 26 Nov 2017 19:22:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMa6Pvp9x2JRrzxnvgo/Aj4WVL+ny7rDnYBtG6FvkAUXL1pS4XGZhz+Ln6QjsdW+V1tDFcVu X-Received: by 10.28.224.4 with SMTP id x4mr14457183wmg.118.1511752943433; Sun, 26 Nov 2017 19:22:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511752943; cv=none; d=google.com; s=arc-20160816; b=vDFbdU6vzt2YilrkSgpU8FV7/wuyCSSkI0xtT/pLnQUht0+hO9C+5sjHlYXVp5686O CTdnhdswoZZToFEAihtM/8+1yCUK9PMuZ0bWF4Sm7iaFX5XXW/I8soeah54WtmCoj90A Q+3egpeOGNpdI54vu6zFDotfKxjLoWjPHfLTbWGmOrGlTqycaL3dExHtfiqR8oSEINa3 kCIFcBUS+0LLZPLXTRiRaDDidI0wEs3xCh/w23IBwDsYh6/VrxYZkhrnJRDbKmPx1Mf0 nGTKMWZFbi8wB1qDvxbCshzWRVi40OQ67bhgu/fuawux45thZ3KA/ddx3KzAhyTdNQUR QiCw== 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=DFfw5ToXaTGskh06QNG0Iz2KodBUWKTBJgimVB2qHT4=; b=D+IPCEhr9y5F4uOY8zxdG61MmkYWKOetxjRTcyf6UPYoulna+FP/KZMbaA/nUDbaPm HV/2z5WebvAMP/nUV0xMxdM8AvGNUzsNwOOs/3NRjd/yTuopPbcx89v89cs08tVZiZHQ nC0zFu4cHsCOXt+NBzwGI45mOIe8QCk4mMPLDjoZaknK7N98c4HjZHQmjhgV2kBbPHiQ Hu4o4daxc3Q9rXHUEe0hPVaG1MnPcQHIWsNXLbY3opryTvfNHuA/BvH2IqDGVbOlxd2U L344yrlj8VwvGbpFHpyK0NvM0JqxayB6OqqtxBw2q322o2v3VWTSCCu75Mv/xPHWngiK Z+qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@163.com header.s=s110527 header.b=g7/jWRpU; 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 g99si22792235wrd.498.2017.11.26.19.22.23; Sun, 26 Nov 2017 19:22:23 -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=@163.com header.s=s110527 header.b=g7/jWRpU; 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 A1F6768A130; Mon, 27 Nov 2017 05:22:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m12-16.163.com (m12-16.163.com [220.181.12.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 194AD68A084 for ; Mon, 27 Nov 2017 05:22:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=E0csRciw6H/Es1aeZC Pz8nRPKx/Qft/1afng1aVzZnQ=; b=g7/jWRpU9uhGmDTAq/hm8WI69+AZr+RFeu QbVEZHBmM7PgVUUkVj3q21ObLnKeX2QD+8Oh7TiUivJ5tGLx+H1cCh2IEOEisIfj uBXTs9m/f1aDo3Rf4SX1E2t4l5ekI5V94Ct+MXX+qT6rsDCyLkQpjomalxdO2s5o JNmymni9w= Received: from localhost.localdomain (unknown [106.120.213.112]) by smtp12 (Coremail) with SMTP id EMCowAA3gTDjhBtavCfJBQ--.1007S3; Mon, 27 Nov 2017 11:22:13 +0800 (CST) From: Pan Bian To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Nov 2017 11:22:02 +0800 Message-Id: <1511752922-25710-1-git-send-email-bianpan2016@163.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: EMCowAA3gTDjhBtavCfJBQ--.1007S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7XFWrAFy3KFWrtr47AF48Xrb_yoWxuFc_Aa yIv3W5WFWxZws3ta90qayYyr4Sga98ZrZYyFsrJwnxXF9xGa45X3y5XFn5tFs8GwnYkayY y3ykZr12gF1jkjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8k-BtUUUUU== X-Originating-IP: [106.120.213.112] X-CM-SenderInfo: held01tdqsiiqw6rljoofrz/xtbBUQWdclaDwFZHzQAAsy Subject: [FFmpeg-devel] avcodec/hevc_ps: set correct return value 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: Pan Bian MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When the call to get_bits_left() fails, the return value is not an negative error code. This patch explicitly assignes an error code to the return variable ret. Signed-off-by: Pan Bian --- libavcodec/hevc_ps.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index a4f7ed6..f87a577 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -1691,6 +1691,7 @@ int ff_hevc_decode_nal_pps(GetBitContext *gb, AVCodecContext *avctx, if (get_bits_left(gb) < 0) { av_log(avctx, AV_LOG_ERROR, "Overread PPS by %d bits\n", -get_bits_left(gb)); + ret = AVERROR_INVALIDDATA; goto err; }