From patchwork Wed Nov 9 00:11:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1356 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp17884vsb; Tue, 8 Nov 2016 16:11:40 -0800 (PST) X-Received: by 10.194.23.67 with SMTP id k3mr12750206wjf.103.1478650300529; Tue, 08 Nov 2016 16:11:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id pb5si38243789wjb.189.2016.11.08.16.11.39; Tue, 08 Nov 2016 16:11:40 -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=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 32A90689CBD; Wed, 9 Nov 2016 02:11:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1F43689BB2 for ; Wed, 9 Nov 2016 02:11:28 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id c17so25856443wmc.3 for ; Tue, 08 Nov 2016 16:11:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=mbkxcG3Y6FN/X1ytv6uyyo5vBQnmXCiyW6Uo0hxUq6I=; b=y8R8ED+kR6nqShAoorFsL0RjBUj/1L2zWHVLIzrO7dkZ937mZIWndqVoZ165YNd4jp 5+HLc/I9dBjv7YuRvbCAIJKRSj0EA8fMcfmXe62tGz9qiZVAdRM739c1q0IdBwBxQNES L49hYR0u5TRULtIkapy0Rfv+tKrdueY1n1NQsNNasg92xEVHpCWvwvwQkpLcVNcrf/di cBAzMiBqKc2v2l6b6xqF5xCi8rvqbxUMjM673TzcJFBKdT6+tJqPTqf4qpcgAU9iFaOv ovchcSunJgERicS6wIXOMFr1L+hv8KS0RbIstOIXjgOl51ook19fKP+EX9Cug4aYsA2w KpvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=mbkxcG3Y6FN/X1ytv6uyyo5vBQnmXCiyW6Uo0hxUq6I=; b=D9dCbucKedK/T6TxTWbA5nR+9L7BwsnfGe70Ym2HCVG1wQVrLIY8GHSkQ9NvfgLwxp m+tHZXq1FVe8MbETJIGJp9pKQWTBb1Fnvb2YeSTNn9M2X9Z3fnWMeuNOkG59WOHY7DPH UjxT/qUvi+22PEfwy44T+4aCzkqcjU5SeQG/Kp76H6ubFYeyuLDJYoPTDLFTxDpqpGL0 VnSq6yIKukLwGa7Fok0ddb8kCpiyqBTCrZF1Z40mmE8Jo/UoAh+01+Yxx1BZCy9QkhVi DTjf5mbr4HqEoomry71CXKjf62AEsM0jfh/b54XE4x1qvjgPYiyRM3x1N6WbSi1igcxI Y55w== X-Gm-Message-State: ABUngvc3kdCPtv7lE9QqWAy1mOJI/evY7kWiOc2YeKmTTY+k5lLdrmV0GE1KpJXdNQB/5g== X-Received: by 10.28.1.135 with SMTP id 129mr19344802wmb.108.1478650291556; Tue, 08 Nov 2016 16:11:31 -0800 (PST) Received: from [192.168.2.21] (pD9E8FF48.dip0.t-ipconnect.de. [217.232.255.72]) by smtp.googlemail.com with ESMTPSA id k74sm22333962wmd.18.2016.11.08.16.11.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Nov 2016 16:11:30 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <665e0d12-f81d-3e6a-6f4a-2feccf1b20ec@googlemail.com> Date: Wed, 9 Nov 2016 01:11:29 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] pnmdec: make sure v is capped by maxval 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Otherwise put_bits can be called with a value that doesn't fit in the sample_len, causing an assertion failure. --- libavcodec/pnmdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index ca97cc3..0381ea6 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -145,6 +145,10 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, /* read a sequence of digits */ do { v = 10*v + c; + if (v > s->maxval) { + av_log(avctx, AV_LOG_ERROR, "value %d larger than maxval %d\n", v, s->maxval); + return AVERROR_INVALIDDATA; + } c = (*s->bytestream++) - '0'; } while (c <= 9); }