From patchwork Fri Jun 26 20:28:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20633 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 4EEC7449F93 for ; Fri, 26 Jun 2020 23:28:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B01368B0BE; Fri, 26 Jun 2020 23:28:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5029568B03B for ; Fri, 26 Jun 2020 23:28:31 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id k6so10671660wrn.3 for ; Fri, 26 Jun 2020 13:28:31 -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=FRfvvwvLF3KXeg5eK3vy7SEmXH7jBT2VuF5OL4bu9Ls=; b=QOtPMUYlvG/rI04olC6Glpi+vRO1xH6ZgehnSpkBjL4n4JwYS3jwp4zx7dAYEigzxS g6xsdrhm7rHlcmkjtK7qoC3v9OLxVRmRCZ5hOVwyeyHq20YS9fgnWGB+OkX9jG+1Nwkp pnPkOl5Is8Oh8G8IOB1/rXZvsKOy9m8j/O1MFMpWQKYWHLZEEvsF+/xmcyhz8Lz6Fe/h XMAL/3LI0VozP7Kz8ycSt/ExJPDl61yZUEzcKFRIPCc56XcCSuAShGe/FoPAMDg0CG0u 9v2o48BFO+0HCQ02yhmfQbqjCYIjXnmeF/XQPDGPqeBqDlOMciOqBbqilsTPX/aHj2xO 3sVA== 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=FRfvvwvLF3KXeg5eK3vy7SEmXH7jBT2VuF5OL4bu9Ls=; b=hHNFm6+Ta26Ckl12hPNm+ttjcTfsTpWBo1+DYj3raUh8ZtrTtYXs2DssmXmKZZU0gt cNKXdSA2WIQ8e0lC5zz4ZcpY9KLtgHlUT+E3iLwKLHLiCoA71/oETQ4p3iGoShe9BPS0 lR2l49lFQBUzz4vC3x+WN2M6nfBdTMYXs9xjsP4YRNWi4sP5X1xMG9osiMdBWSfLXZeh hIlxTDGJBf7s9/JF4V2TzbdIL8rNkTYhyXEC1b0oAWaCTkakej4RvXGhv9/kHq08hd4a VQf/PMdHQmORK1J+JviH7uw6MdkvXFwEKj4SE+FqNdcEoQMMTM2K05EUL+OSx/ArnvZR kxEQ== X-Gm-Message-State: AOAM533wAR1W6nmkQPGUwrHQkdzbYyHDXLzZqznMvpxX/QU+INBbEi2+ qUKLoGCgudbb4cvQ5GrbGTsqqjLC X-Google-Smtp-Source: ABdhPJzevkSkjVkfT3z/NCZxkXkhiGH454aE6qbKqgjuey+2Fpo3zTD4Q1iLNOsdsA2oOH0tL1IicQ== X-Received: by 2002:adf:eec8:: with SMTP id a8mr5506299wrp.421.1593203310279; Fri, 26 Jun 2020 13:28:30 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id u8sm3519293wrt.28.2020.06.26.13.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 13:28:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jun 2020 22:28:20 +0200 Message-Id: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/bitstream: Don't check for undefined behaviour after it happened 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index be8a0f634d..53a2db7451 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -162,9 +162,9 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes, uint32_t code; volatile VLC_TYPE (* volatile table)[2]; // the double volatile is needed to prevent an internal compiler error in gcc 4.2 - table_size = 1 << table_nb_bits; if (table_nb_bits > 30) return AVERROR(EINVAL); + table_size = 1 << table_nb_bits; table_index = alloc_table(vlc, table_size, flags & INIT_VLC_USE_NEW_STATIC); ff_dlog(NULL, "new table index=%d size=%d\n", table_index, table_size); if (table_index < 0) From patchwork Fri Jun 26 20:28:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20635 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 CEC2844BE0F for ; Fri, 26 Jun 2020 23:36:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7BB368B119; Fri, 26 Jun 2020 23:36:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C77468B029 for ; Fri, 26 Jun 2020 23:36:47 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id f18so10531561wml.3 for ; Fri, 26 Jun 2020 13:36:47 -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=hHNipj53AavQgHfjC8AGTV4/EKLTrs2XUkALOd7HxG0=; b=WheRhgv5Niq6NlfJOpnS8c88kl87VgK8j4zac8Q0aMkQO5GsNrXGCKzfSHn1jhlHxp I8TZ5oeXmpG3ifQdiLtXdsQteWTFBgucI9pdS+1HUHByvfwKCUkbNmf0E079zCRAFJrc 5U8SxEFRPCN5Z0R687qQmSnk1eRzjpkNn0MQKldOibK7RsD72FArNhTS0uiWktADe3Ih 3wtr9VxcRlc1IN4sonRrF4VcWm3mbta8MMFsUIm2nU2JMwzdRlJgH/Z1Fmt0jS+R4PHQ v5f4GGCY2lIdd6jwssDUxX537YtqvMFmg1zDqkpB7iG0Un89qKGWtRhvgOY/H0gEkIiE kDeg== 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=hHNipj53AavQgHfjC8AGTV4/EKLTrs2XUkALOd7HxG0=; b=fBzB0XpNSgiMjUgiiZWTxHIkweJzhiI9Py1hnyMKwB1iJY5Ymr2GzteIiFew0PWekx uuaYYB8Uuo5d1VhG7aSbqz0ETKxpfm7l6+cKIi5JvUAkjIF3RnKTSUgPiRDXpiKKPjFn rg5RoqJiZBB8HcwTA+PeCQFYukXtLcQwGzCE/8sOHFRrgbRH9ZNfv0r6rr4c6QKw0ldS qRclTJSPAbH5mpxCJOr2+eXCT3fpenC+78mwPoJwKfqroAvSkaLItzgX5sjfQrcmNsZh Fli64MIeuNdR74d7Eh5mR/457L8Ln1d9BE7/Z649A+IKu+EzRwxAuz+1Kw07yvdtoEwe Eg3Q== X-Gm-Message-State: AOAM531p6B9udF72TjGVFgzaklHmN5TsllEMC3PXsh05gEO912OYGlaq DhqkdF724K8VRVoKmpTPpqg05xz4 X-Google-Smtp-Source: ABdhPJwVXGrAoo8LLlhCA9HyOkZmMupJz0CFv7ZE2ZvDZMh+GJ+6o+df7CSKZGA1fKUcijzyvnSujQ== X-Received: by 2002:a1c:29c6:: with SMTP id p189mr2090148wmp.70.1593203328021; Fri, 26 Jun 2020 13:28:48 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id u8sm3519293wrt.28.2020.06.26.13.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 13:28:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jun 2020 22:28:21 +0200 Message-Id: <20200626202822.17751-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> References: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/bitstream: Avoid allocation when creating VLC tables 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/bitstream.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 53a2db7451..d379dbc0e8 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -285,7 +285,6 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, vlc->bits = nb_bits; if (flags & INIT_VLC_USE_NEW_STATIC) { av_assert0(nb_codes + 1 <= FF_ARRAY_ELEMS(localbuf)); - buf = localbuf; localvlc = *vlc_arg; vlc = &localvlc; vlc->table_size = 0; @@ -293,11 +292,13 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, vlc->table = NULL; vlc->table_allocated = 0; vlc->table_size = 0; - + } + if (nb_codes + 1 > FF_ARRAY_ELEMS(localbuf)) { buf = av_malloc_array((nb_codes + 1), sizeof(VLCcode)); if (!buf) return AVERROR(ENOMEM); - } + } else + buf = localbuf; av_assert0(symbols_size <= 2 || !symbols); @@ -309,7 +310,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, continue; \ if (buf[j].bits > 3*nb_bits || buf[j].bits>32) { \ av_log(NULL, AV_LOG_ERROR, "Too long VLC (%d) in init_vlc\n", buf[j].bits);\ - if (!(flags & INIT_VLC_USE_NEW_STATIC)) \ + if (buf != localbuf) \ av_free(buf); \ return AVERROR(EINVAL); \ } \ @@ -317,7 +318,7 @@ int ff_init_vlc_sparse(VLC *vlc_arg, int nb_bits, int nb_codes, if (buf[j].code >= (1LL<= 0); *vlc_arg = *vlc; } else { - av_free(buf); + if (buf != localbuf) + av_free(buf); if (ret < 0) { av_freep(&vlc->table); return ret; From patchwork Fri Jun 26 20:28:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20634 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 CC34644BDDE for ; Fri, 26 Jun 2020 23:35:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8E5E68B0F4; Fri, 26 Jun 2020 23:35:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFC2E68AF66 for ; Fri, 26 Jun 2020 23:35:22 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id j18so9932453wmi.3 for ; Fri, 26 Jun 2020 13:35:22 -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=JqVPCVMXrb4d0g11ZuGYM7UTsqAjnsRh5yaGBhXAKm8=; b=qyYXD1LDy9B0icfq0GaQ5OJXT3/DGsRMPu9fc3un60EMdYUL75yrYhZJlVM9QIZncA VANd1AIvHPj6oCfWvSWGGNyLN3AEeJiT0Dy8Ydna6kDtfDJ8g7lCHNR8XE54vbYaghO9 g4Wu4lD5krKA0rfr43CnCQQhI4bJEFGCobq+T0LdJ9Cwv5kFlvGrGmZ5VAuA7cyuydkn rifFn3DhuBzRUFM5Q6ketcG0bU1NWs/vLT7eIanNeQgsWQLCkXY1U/hkA4wv3mOIvMOj 4UVuC6ymivXYitaYgUs6CayUf4UwH7w5YuWwbb0ybpKvW22NxIPlcvML3P+C6yhEuZ40 eSHQ== 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=JqVPCVMXrb4d0g11ZuGYM7UTsqAjnsRh5yaGBhXAKm8=; b=FegBu/VvUXGPzCEFHI88E4GNSw2+uJSI1a873gEz522LKC95PoiGKFhW3frlTwmLT/ sSJUNriuO3dfdbtopaR9IQ9MqIgRiedk9hsoIP4kp8PIpAnNhqxz8Er8gVpCZfuf0rx7 BoNRtJWAlV4l3mKsnwizP7YsmevlB6xfw6xvWncRyNn60a+2wUwJtlLbmzoGAt/26czw yR03uJxI/xtl2Oqx/uVk2DsHvhxgclxCp6YYqz+R9D/IA3ncoJc0CGXuVejUiUWml8LA JCg5J6+iqlp3FeMFFf3hwYDE1Pt0oWI5mAbvwFfE+FtwyuBd+Tum81lDZYU1kmDIvhPA Uo6Q== X-Gm-Message-State: AOAM531RS+j2CW4OZKotupsDwUKwam2/Dxaqoag6wtI1vRzYFpbDf4IC ZXgHRBFUS82tJ6A5NcvOFAm+9k/9 X-Google-Smtp-Source: ABdhPJxSRzqcblZ/Bm8du6iGnc4av5SS2c1jAxHtxJFoMrWHdGiJm0lUQSfOD9r1QOjlh0WCsz2ahw== X-Received: by 2002:a7b:c09a:: with SMTP id r26mr5142867wmh.176.1593203329267; Fri, 26 Jun 2020 13:28:49 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id u8sm3519293wrt.28.2020.06.26.13.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 13:28:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 26 Jun 2020 22:28:22 +0200 Message-Id: <20200626202822.17751-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> References: <20200626202822.17751-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/smacker: Add FF_CODEC_CAP_INIT_CLEANUP 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/smacker.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index b4c463b4b9..9f054f071d 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -600,13 +600,11 @@ static av_cold int decode_init(AVCodecContext *avctx) /* decode huffman trees from extradata */ if(avctx->extradata_size < 16){ av_log(avctx, AV_LOG_ERROR, "Extradata missing!\n"); - decode_end(avctx); return AVERROR(EINVAL); } ret = decode_header_trees(c); if (ret < 0) { - decode_end(avctx); return ret; } @@ -840,6 +838,7 @@ AVCodec ff_smacker_decoder = { .close = decode_end, .decode = decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; AVCodec ff_smackaud_decoder = {