From patchwork Thu Aug 16 13:36:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 10008 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp2044852jad; Thu, 16 Aug 2018 06:37:04 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyeXQyg3Sx2l0DZjEO2+xCWMHvHDPAZtvt5P0EaURiLh1ILgk8YJGAOJbs+uyrm9Juc2AzS X-Received: by 2002:a1c:5f82:: with SMTP id t124-v6mr16378383wmb.14.1534426624127; Thu, 16 Aug 2018 06:37:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534426624; cv=none; d=google.com; s=arc-20160816; b=dLzU26y+l4TAbbjocQ5eCC9pwuFIC04LTdtH5vn6tPPfhflr+VYrN5qbmszpxWTlIx lvzYATtvHr4NCUEhBo2CiwhIfwJjU7X95U/6wndSsm5LUytoP14QUcERItDODlItHozb s8edy4vC1yi+EyYN47ja8WtiJnnGoLP2f7TR6lPQy1wbi3qRzRqDbueu/DYiv41Coj3t rcv2xKQmZoFFniH565xzC0eJjldud3NQFZKrGlEn9hubIVMvAZTNw9O1p77yqHYo/bV6 ejy5NbRGDzotJCfnzjkafwWGqehRBPnRhuAKzy4dCxhUff/jaRPlfQMwnVMjWO4jHs3A 9YBw== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=lBTxwcn3oF8FS6aLaJw578OOkPJIEmdTfBA5fKW7yvk=; b=qMn/YXHhYKHq3Gr8QKWfAmYJ9msBeKBTGl6DX+GXFjeFowcYtdvnZOQwCojNS2YE5m X+UPg+USj/z0nt9M4X/JcdSomOhNJEY8nVTCeierDhuqiV4MKqvH1AAECHQfXhXiu0R7 vISr5J/veCsdQiRLFw+JLaoGxmvCqYmWutwQOFGorqi2UH1aMaeV6B/kPDm7+TCEaLXr ugEwloX6vqtJRJapHU+YnSwnK1iisNM6HkQslWOflvbr8jtGwFPezLnbi/DNPWpTvnMe yzmGu1/6RcrxfDqnmfwVEg+YUvHXcM7bfvrU6KnilPGECmsb4G23uZ4r8DxIFHBbxN1d ZaOg== 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 v4-v6si885122wma.45.2018.08.16.06.37.03; Thu, 16 Aug 2018 06:37:04 -0700 (PDT) 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 D219E68A744; Thu, 16 Aug 2018 16:36:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C38268A6CF for ; Thu, 16 Aug 2018 16:36:18 +0300 (EEST) Received: from [172.31.218.53] (helo=vie01a-dmta-pe08-2.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fqISB-00011E-IK for ffmpeg-devel@ffmpeg.org; Thu, 16 Aug 2018 15:36:43 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fqIS6-0006Mu-4h for ffmpeg-devel@ffmpeg.org; Thu, 16 Aug 2018 15:36:38 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id PpcZ1y0020S5wYM01pcaJR; Thu, 16 Aug 2018 15:36:34 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 16 Aug 2018 15:36:28 +0200 Message-Id: <20180816133629.9352-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180816133629.9352-1-michael@niedermayer.cc> References: <20180816133629.9352-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/mlvdec: read_string() received unsigned size, make the argument unsigned 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: infinite loop Fixes: mlv-timeout-e3b8cab9835edecad6823baa057e029671329d04 Found-by: Paul Ch Signed-off-by: Michael Niedermayer --- libavformat/mlvdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index d387c871ee..ded8196af2 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -77,7 +77,7 @@ static int check_file_header(AVIOContext *pb, uint64_t guid) return 0; } -static void read_string(AVFormatContext *avctx, AVIOContext *pb, const char *tag, int size) +static void read_string(AVFormatContext *avctx, AVIOContext *pb, const char *tag, unsigned size) { char * value = av_malloc(size + 1); if (!value) {