From patchwork Sun Nov 29 02:08:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 24141 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 19E554498CD for ; Sun, 29 Nov 2020 04:16:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAD4D68812A; Sun, 29 Nov 2020 04:16:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A17636880ED for ; Sun, 29 Nov 2020 04:16:24 +0200 (EET) Received: by mail-io1-f66.google.com with SMTP id n14so3561987iom.10 for ; Sat, 28 Nov 2020 18:16:24 -0800 (PST) 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=u8YmRE0/x0P4eSXhO+L14MJ1FSws65paskNbDIKQ6Ww=; b=EVa4NT/F5XViTLWFa7FeB+teNlQWiVk9gKYzbmsKDe/aZeeZD8dGemIJcWrNVeAFXz pU7HLA1xHlJXK2X/Bv0SG27T5HuygtaKEWJTeXmXnu7nZpcmkrPLnIkl7o6ijitezYfA SaIIEbMGIk5MP/eANddFhUI59i/iJwZkYSHBXT1IECBHH6j4m2tBJwzso7UBQeRfb/hw WKxHKRra1RGcGIl6RvfrkzJZD5ZVdEOLg8qRgrUjkg4dVwsbmjsP6ic9KbEXdZsamkJX 1wausynw71iTte3aMGl2HLf5fHZ93eXaKilD2WYwfK989lXOWeORIUoC5DLNjAgfb/uC sfTg== 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=u8YmRE0/x0P4eSXhO+L14MJ1FSws65paskNbDIKQ6Ww=; b=YJCSkBGqDG+OVXCez/BJSBvOKWt4M0gk6SdhIgyJjADFTWaT2fUAuIlSOSUgTqISWw rrSCZQOXvJaLQYALuEo6+2khDHFM8w8OB5hfM9+b5X3LmzWrzO2A/A2YhMk4GrSyHBBo 0ehYnxjTMUeNXTAcNR/tmSiUMdPZqNvEzuTvezoX5DYqsZp/cX6qLAkvE/xM6ATik9ny JFl2BnJidoNFm7y4L2pJPG9k1SyPcdwWwHcE7XvB63yKCmsX3z93xr1bMW3bALghud+R 2ADl+tOnC9seTEvhPsmeivMOQRHc4uftd6+W68DLt9bzZHDvQT/9kppzdFZfo4oZM/Wj 6j9A== X-Gm-Message-State: AOAM533C9DtYi3/IQQveb4D6+vdccYthnm2ZL8wJJEki3osJMBULNjR/ inNETNJMNRcdqO5AclNzWjPHWU1fxmU= X-Google-Smtp-Source: ABdhPJwCTu4RXp8WIuZ18zg7h1OA4ZLe2meN3YUvE427kKdzn8Ipt/UOotry8mp8tQVFIvtyrS1Dug== X-Received: by 2002:a63:2045:: with SMTP id r5mr12578631pgm.6.1606615765996; Sat, 28 Nov 2020 18:09:25 -0800 (PST) Received: from Guangxin-PC.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id a2sm12215180pfo.117.2020.11.28.18.09.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 18:09:25 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Nov 2020 10:08:51 +0800 Message-Id: <20201129020851.12573-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/hevcdec: slice decoder, fix crash for thread_number > 16 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: Nuo Mi , cus@passwd.hu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" following comandline will crash the ffmpeg ffmpeg -threads 17 -thread_type slice -i WPP_A_ericsson_MAIN_2.bit out.yuv -y the HEVCContext->sList size is MAX_NB_THREADS(16), any > 16 thread number will crash the application --- libavcodec/hevcdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 699c13bbcc..457f75b551 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3406,7 +3406,7 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) av_freep(&s->sh.offset); av_freep(&s->sh.size); - for (i = 1; i < s->threads_number; i++) { + for (i = 1; i < FFMIN(s->threads_number, MAX_NB_THREADS); i++) { HEVCLocalContext *lc = s->HEVClcList[i]; if (lc) { av_freep(&s->HEVClcList[i]); @@ -3608,6 +3608,10 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) s->threads_type = FF_THREAD_FRAME; else s->threads_type = FF_THREAD_SLICE; + if (s->threads_type == FF_THREAD_SLICE && s->threads_number > MAX_NB_THREADS) { + av_log(s->avctx, AV_LOG_WARNING, "too many threads (%d), reducing to %d.\n", s->threads_number, MAX_NB_THREADS); + s->threads_number = MAX_NB_THREADS; + } return 0; }