From patchwork Sun Jan 1 19:27:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2011 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp3701060vsb; Sun, 1 Jan 2017 11:34:33 -0800 (PST) X-Received: by 10.28.69.17 with SMTP id s17mr49237690wma.141.1483299273376; Sun, 01 Jan 2017 11:34:33 -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 to13si70508358wjb.192.2017.01.01.11.34.32; Sun, 01 Jan 2017 11:34:33 -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 9077968973F; Sun, 1 Jan 2017 21:34:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35F13680A6C for ; Sun, 1 Jan 2017 21:34:20 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id l2so54001765wml.2 for ; Sun, 01 Jan 2017 11:34:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=EjV7wWwG1KJJO8tgvQ447xZfYxF/Dfy5D2hVSOeu7Kk=; b=L9KAsqfKRbDQQ44lT7EuLGdIIKd3sHujLpo95iHYUTt07OVi+LPTbDRu7z8a8cXLBm HQu2vP4RMfMcpj0w7zHlZvrmmbAqiGHNkyI3cO1YC6FkVX4jxV0ZBuk2EYbiS2KGOKQS mc2cbE9UehKa9jlczz4djZcgLK9529srrRhDtDZVaCabywPVMKxKkn70kPv15JuTs3hd WfkBtA/nkzdzpcYX2fjuDAyZaz7r2yMmWhKaGO+mxJE0tvKo4fbj7UB8Yruxb7xx/ROa 4TE3gEP8ibvTqiEMGAs0ExzGlf7+7wJSXoAh5JR0VId/cj6qLDFyTDQZtWUF97ZcPMEm fijQ== 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:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=EjV7wWwG1KJJO8tgvQ447xZfYxF/Dfy5D2hVSOeu7Kk=; b=j3Cuata25DhmIyLV73+UlGtxtkkiUdposNeer/mZscbMlbyWoJ+nQ7xuLN5CGu31nA 2geSM5Op3mZZuZxKO/l1Sm5pAQGJqd+e/vcQnZTU+KqoR5Ksk6fL5ROlJ3qhoEPEZFsW Hf2gctM0ZIDheKhm+2kSEuIKYY1tD9fywbz3OBNYv0IOcEPxULY75KYLuCTe7+WZi6QA u/WB0RAGYnHCie3lDFUD8re3OagQGOqj1fKLW1iXo4fq/golGFvTu7frqsZD4tVlt6zd b8mAF3XKl8O+Of4A8jtqAoPMpxpfW5uX9vKg4b/iJag8hlFJ64bMF6y1o366aBuCOpOd Qczw== X-Gm-Message-State: AIkVDXLr86v4pPFKJPAZ0b5dWiaOD+GQaVEWcTcLVdJs4SkzlbXtC8H6BqOxpjVYdYYUbQ== X-Received: by 10.28.150.75 with SMTP id y72mr52424947wmd.47.1483298880466; Sun, 01 Jan 2017 11:28:00 -0800 (PST) Received: from [192.168.2.21] (pD9E8F88B.dip0.t-ipconnect.de. [217.232.248.139]) by smtp.googlemail.com with ESMTPSA id e3sm49209762wjm.12.2017.01.01.11.27.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Jan 2017 11:28:00 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Sun, 1 Jan 2017 20:27:50 +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] libopenmpt: add missing avio_read return value 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes heap-buffer-overflows in libopenmpt caused by interpreting the negative size value as unsigned size_t. Signed-off-by: Andreas Cadhalpun --- libavformat/libopenmpt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c index e7091ef9fc..35fd28f5f4 100644 --- a/libavformat/libopenmpt.c +++ b/libavformat/libopenmpt.c @@ -82,6 +82,11 @@ static int read_header_openmpt(AVFormatContext *s) if (!buf) return AVERROR(ENOMEM); size = avio_read(s->pb, buf, size); + if (size < 0) { + av_log(s, AV_LOG_ERROR, "Reading input buffer failed.\n"); + av_freep(&buf); + return size; + } openmpt->module = openmpt_module_create_from_memory(buf, size, openmpt_logfunc, s, NULL); av_freep(&buf);