From patchwork Fri Jul 10 13:48:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20944 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 26CBC44A131 for ; Fri, 10 Jul 2020 16:48:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 021A76881C5; Fri, 10 Jul 2020 16:48:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA6DB687FCF for ; Fri, 10 Jul 2020 16:48:16 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id g75so6231500wme.5 for ; Fri, 10 Jul 2020 06:48:16 -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:mime-version :content-transfer-encoding; bh=UqWUEZSK+zUPwID4bmpdrd9H6N5oHhOH0K6TMGwVAO0=; b=Ueud4ZdkK7pN0dd6y4pUUnwkO6bhitZPHMQVE9xawTMUJxUbTnad+lAUCgxe/rOrVO FQ2e91DZxPKfJa/lZvMf5XY74FBvZBY7n3XAh7yZf94Kt6Xjs6MPyrNOdaDRbpyQVRzv xoe7MOw8irnH/OeLG68n7dzjAddJOyQaQJ+LOpiump99SO0mXuKfCjppZ7VHIMvIoapc K9ul9vP2CRzd5PO5N5HO99dtygq4hrPZzPr43Yh5pRdlFbjYACMMvrxS6D8+vJJAvYDy Fob7JLEVv6WlNAjrRUnmxtfF6DGHMMzrpK31t7cZgXlXm3qEXBK9wl5ePyssx/U2wk7s oADA== 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:mime-version :content-transfer-encoding; bh=UqWUEZSK+zUPwID4bmpdrd9H6N5oHhOH0K6TMGwVAO0=; b=OE+HoqqFaOK19+EFxnOLryKHOfjAiszTueKnq3UVCGIe9ZdD8O1luhxZFnZvsSzahf YJGtHqZLP6MH5VCGfyLxYFbPBpKknG8DnTXrLvIcBNSCc6L3PUtsPDkIM2BVB5iJ5j3X At+7HMvk88VLb3FwI2sj1aHCIVMPxZr7aP2ZJJKfyUjFde7GPtppKkMLhzn+7skfP2Go yeE9jziT5sMbfgAXi/tsF9Xx+lWLok5aUd7JqJe3Fi0mguUCGkdomyrJ5ndognCi508A lo+VHeXQ+9XJ4eBhwkyUZrfS4gjSlFJ3Tk0EnRm2M6KUiToJbk1ziBjtLQy/cVsb7ebJ G4Yw== X-Gm-Message-State: AOAM531+i3wo9Bmz5Qym3GmN2RQS2No3ktJbpl8hDrnRMUY1satcDQdT ql1v6fO7BgjXtKnA2DwTlGOZ3nzB X-Google-Smtp-Source: ABdhPJzv+OMectP93+acqH80D00+oioQsNhcGOLvg0tuAZAd/9csqa5/xLJCZ8JR7oldn7Ngcsk3zw== X-Received: by 2002:a1c:5f45:: with SMTP id t66mr5588710wmb.144.1594388895922; Fri, 10 Jul 2020 06:48:15 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id x185sm9966390wmg.41.2020.07.10.06.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 06:48:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jul 2020 15:48:03 +0200 Message-Id: <20200710134803.4347-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/golomb: Prevent shift by negative number 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" This happened in get_ue_golomb() if the cached bitstream reader was in use, because there was no check to handle the case of the read value not being in the range 0..8190. Signed-off-by: Andreas Rheinhardt --- libavcodec/golomb.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 7fd46a91bd..5bfcfe085f 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -66,6 +66,10 @@ static inline int get_ue_golomb(GetBitContext *gb) return ff_ue_golomb_vlc_code[buf]; } else { int log = 2 * av_log2(buf) - 31; + if (log < 0) { + av_log(NULL, AV_LOG_ERROR, "Invalid UE golomb code\n"); + return AVERROR_INVALIDDATA; + } buf >>= log; buf--; skip_bits_long(gb, 32 - log);