From patchwork Tue Jul 21 02:12:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21212 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0FAA444B6A8 for ; Tue, 21 Jul 2020 05:12:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC2E968BB03; Tue, 21 Jul 2020 05:12:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f65.google.com (mail-ej1-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3950E68B9FB for ; Tue, 21 Jul 2020 05:12:39 +0300 (EEST) Received: by mail-ej1-f65.google.com with SMTP id ga4so20043314ejb.11 for ; Mon, 20 Jul 2020 19:12:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UvhTl3ThZK8M9ixD2OaQmUadCjhBAkoiNQSy2qYiPbI=; b=iUm+Bv9l4Mqo2XVzyzlTErtZjla0D4iutifm1ws/0pIQzzWDPN0MN6KzTfRHci7oku TREM4hMa0MxTgadAH/NICtqTTGYDEa7d8e/fixb/ZOgOFdE/G+yRRuTJvkDyM8FexGE1 0Ef0XiWbM2d1BmlbkktdqF3QNdutxEqa6Oe0cDSJJRjn6D/X5mV7hI0qKlCZil6I94kv po3WFrp8GGB6vD0efaWsF3e0rrKNep4qVkwdDO7ntlvS+WdxT0ku0fHqpTlTG9t6IRya arD4cSADNvK/s9euUBltOZ3CSyuBreQKlRWIr8jzSk93I4XnbVTe3WhFRRqYXIgSHYuS nnog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UvhTl3ThZK8M9ixD2OaQmUadCjhBAkoiNQSy2qYiPbI=; b=khp6zEkXLHWmdApODSmMwPxA+cWlK3Eh/GCaJQqYCZd2UlmItTZ15YCXfC2Eb4IwXv tGROGWgLELlHlexs/2hjATW9Tzr+747rMykBZ4R8mlUfHSQ/0wtu0zfvZwhGMAzLUU9l cWOuorYs/Og7hVGYEwknYWvr74+cUsi3jp75pdAtGG1bPsro+Th088xV7sIsBqNDY4go wkAvlkZcP7CU+mJRZh7ApmH5mbByS4228cluWR20MMNzvesP+RWzfQ8KC7RgOOMa8PFB MlPQNnaEDw2wMxz7UMGBYzOMjlSe2q8SWfn/EXkdYB1JNc1uYt8yfC1BsXY9uqzofi5J zVRg== X-Gm-Message-State: AOAM5331mRL4Ghw/oAg1v4qmz+xKtYixZF2Fa57ll1XUwF2Vjp3R3wHd KBy7/Mc/RUnigqVrXj2dT++q/Dwi X-Google-Smtp-Source: ABdhPJwTWl3p4jP6vSLl36Q3pau1U6/TkP69c/rv35OX+vw+dmx/Q9p19r4kBINlRt3zG8VXuXQu+A== X-Received: by 2002:a17:907:94c9:: with SMTP id dn9mr19803994ejc.355.1595297558306; Mon, 20 Jul 2020 19:12:38 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id p9sm15528563ejd.50.2020.07.20.19.12.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 19:12:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jul 2020 04:12:13 +0200 Message-Id: <20200721021215.32647-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200719204755.32269-1-andreas.rheinhardt@gmail.com> References: <20200719204755.32269-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] avformat/rmdec: Fix potential shift outside of range of int 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The loop variable here that can be as high as UINT16_MAX - 1 gets left-shifted by 16 bits which is outside the range of int. So use unsigned. Signed-off-by: Andreas Rheinhardt --- libavformat/rmdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index c88f41c121..e97b861dee 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -500,7 +500,7 @@ static int rm_read_multi(AVFormatContext *s, AVIOContext *pb, if (number_of_mdpr != 1) { avpriv_request_sample(s, "MLTI with multiple (%d) MDPR", number_of_mdpr); } - for (i = 0; i < number_of_mdpr; i++) { + for (unsigned i = 0; i < number_of_mdpr; i++) { AVStream *st2; if (i > 0) { st2 = avformat_new_stream(s, NULL);