From patchwork Sat Nov 28 15:55:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 24129 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 8C06444BB2C for ; Sat, 28 Nov 2020 18:25:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 681EA6880C3; Sat, 28 Nov 2020 18:25:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E24716880B1 for ; Sat, 28 Nov 2020 18:25:12 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id l4so685094pgu.5 for ; Sat, 28 Nov 2020 08:25:12 -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:mime-version :content-transfer-encoding; bh=j9/5UTpbhv4F5w9jAmz4GxX1IdmHjlGKm7PoLFOJl1U=; b=kz7e44fYYmDirZ4luer7Up1PVG14XUDy2wlCOO6hpNQf2eTYME0034ioY+w6wSaLGl eCa4fkBIimLvl3jXia9ZrCPsVnIgd+U3O2R94PjqvgAHRrmvLBL/JK7ZYttTmLvrxRzf 6S4BxQR04oqnXmtzc0VaEn4Zig8eKk92Z/4W+FoqsbuQs24m3/RxR+XsO5RPRoKtbGMj O+Mwm4hNiRbMK/cj5EP1K019WD5ElAcSAREg+fU9lTKzQa346GDBAao1Dz5phlWorUla KUkHRZbRGcHhH6eLHscik8XyMcIr4GMvaCuLvX3jL+ou8XewKfASdnchvT9/0Yy+HmEX fhZQ== 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=j9/5UTpbhv4F5w9jAmz4GxX1IdmHjlGKm7PoLFOJl1U=; b=Fvp/4zGt+h/iQWjKI6Tv4Yhbeh166rzInmWF/x7tQ5p5k9Xf8zmkYNhsJZ3fezVkcm WTQjS5GdAwjCC46G5865qSygbtj01/0ic98askaHG9XaifggkcTwlDxfIV2lCeOhRZdN xundcZ0lRQ2LMEIGlht+lmf4SkrUHV2kWZ10vYcb/PVjXGNDioTOaJbOGiMha3r+QUnN DQKJIKgUpCqDAO00AJy9iuVGvjNhR/xMfcS6vrprHk/9W4jCDpF+F8b/pMsBKoLB7BvC x5RX1Ihq3wNOiCc3Pup7Ax2/Btp16ZJgm0QcvDkW/5kkrzjfg2LPnAg5prPqx9ZmmMqx Zmvw== X-Gm-Message-State: AOAM531L/jkn4BHIqFMKyZ0Qa7XswSdxgyz5AGNJSXxM8iWeoaQbk8YH tSTQ3L35uj1UzGqJsb5Ou0hlrTdOpKU= X-Google-Smtp-Source: ABdhPJyFUuDwFysx+CFvI5cbXNeC833nDVukGDCdy47b4lQIdzfWNJEpz4UtclPwyCgWvlfZokllHg== X-Received: by 2002:a62:37c4:0:b029:197:bfa9:2078 with SMTP id e187-20020a6237c40000b0290197bfa92078mr11695609pfa.15.1606578971753; Sat, 28 Nov 2020 07:56:11 -0800 (PST) Received: from Guangxin-PC.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id h3sm10851573pfo.170.2020.11.28.07.56.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 07:56:11 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Nov 2020 23:55:39 +0800 Message-Id: <20201128155539.125-1-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 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 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 699c13bbcc..e1dae150d5 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,11 @@ 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_ERROR, "thread number > %d is not supported.\n", MAX_NB_THREADS); + hevc_decode_free(avctx); + return AVERROR(EINVAL); + } return 0; }