From patchwork Sun Nov 29 02:59:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 24144 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 D783D44A048 for ; Sun, 29 Nov 2020 04:59:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF79B68810B; Sun, 29 Nov 2020 04:59:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 438DD6880B4 for ; Sun, 29 Nov 2020 04:59:46 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id e8so7902177pfh.2 for ; Sat, 28 Nov 2020 18:59:46 -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=lq/jglErLF7obcf8G1AIUjWtD5dH7e/WGZoxZnEGLZknGSdk361YqSKKy/cboqwGZG 9U8MLeBPN70PjT/+FuK666YM8Ht5SA0PqbYbeL9PNYEkrKDP47Hya++tU04laj8iiOsI O3OYpOzKWp3n4ftDXSRKJ+1MKgXthptz3Y1SoApxpRw0cGF/JQFt+vQOXDb63b1PZ+8P q0BMW4LI4OfjULse+dISJaKpsqVNDQqWZbu6UlY46kBl/X8lv825Jk56jOTwILq3HOt/ jbjjn4IU4g0Jh+2U/eZv+pdYWOAL09opQDmbiktDeYKtIcV8v6+svI4tzrfJb+Sm39zK R0TA== 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=YgSxubY/JzHENwJh+9Hz/yhE9Nww/RE8PdVsGstbaHExhP5jzBQ+ERq6P4OeGOBwmR ohWg+SKKVI8sEB9MhkMKQyeFDoRd6fr8zbPvsflvU3mzAxUsKd4xn/ZBiQNNFH0FQ2T3 bCLl1H6/NpCAHqhkEh9q4/nMkeaL8Y1Q6Bj940vW9yRx0cdhOto1plw5wuHDzvb5d3xH EYG2XLZQv800cow5emOPlSvAW1W5djhGFGP7qBOYkyUX9tDPFF0dNIq+9v/vUa1RbcYO FNFxrpgiLCyUmA9SE2sTgwUcLIt30rGrFFU3iaExUVt+4zFeqSQC5L+1YNM9NhQK+Ahr UKrQ== X-Gm-Message-State: AOAM530b36vyeXxfofIA6FiIAGDKpyU+bz6pO+nm6hy+AEU7Z0KWubyP TYoAZeBywQ2iTVTRLc1y7t07hKPnse4= X-Google-Smtp-Source: ABdhPJwAsJxQ/gr4WQX5OuYFhfeQkYf1O0YRKUikXG7gfytZfMq1eY0Q06asW02EebY8WLIaaZdLkA== X-Received: by 2002:a17:90a:a81:: with SMTP id 1mr18768826pjw.165.1606618784591; Sat, 28 Nov 2020 18:59:44 -0800 (PST) Received: from Guangxin-PC.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id p1sm11803350pff.131.2020.11.28.18.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 18:59:44 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Nov 2020 10:59:24 +0800 Message-Id: <20201129025924.5887-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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; }