github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/wavpack: Optimize always-false comparison away

Browse Source 
Also use the correct type limit SIZE_MAX; INT_MAX comes
from a time when this used av_buffer_allocz() which used
an int at the time.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2024-04-07 10:30:26 +02:00
parent 70e79d289b
commit 483c85e85e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/wavpack.c
View File

@@ -1000,7 +1000,8 @@ static int wv_dsd_reset(WavpackContext *s, int channels)
if (!channels) if (!channels)
return 0; return 0;
if (channels > INT_MAX / sizeof(*s->dsdctx)) if (WV_MAX_CHANNELS > SIZE_MAX / sizeof(*s->dsdctx) &&
channels > SIZE_MAX / sizeof(*s->dsdctx))
return AVERROR(EINVAL); return AVERROR(EINVAL);
s->dsdctx = ff_refstruct_allocz(channels * sizeof(*s->dsdctx)); s->dsdctx = ff_refstruct_allocz(channels * sizeof(*s->dsdctx));
@@ -1433,6 +1434,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, AVFrame *frame, int block
av_log(avctx, AV_LOG_ERROR, "Invalid channel info size %d\n", av_log(avctx, AV_LOG_ERROR, "Invalid channel info size %d\n",
size); size);
} }
av_assert1(chan <= WV_MAX_CHANNELS);
break; break;
case WP_ID_SAMPLE_RATE: case WP_ID_SAMPLE_RATE:
if (size != 3) { if (size != 3) {
@@ -1524,6 +1526,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, AVFrame *frame, int block
} else { } else {
av_channel_layout_default(&new_ch_layout, s->stereo + 1); av_channel_layout_default(&new_ch_layout, s->stereo + 1);
} }
av_assert1(new_ch_layout.nb_channels <= WV_MAX_CHANNELS);
/* clear DSD state if stream properties change */ /* clear DSD state if stream properties change */
if ((wc->dsdctx && !got_dsd) || if ((wc->dsdctx && !got_dsd) ||

1
libavcodec/wavpack.h
View File

@@ -57,6 +57,7 @@
#define WV_FLT_ZERO_SENT 0x08 #define WV_FLT_ZERO_SENT 0x08
#define WV_FLT_ZERO_SIGN 0x10 #define WV_FLT_ZERO_SIGN 0x10
#define WV_MAX_CHANNELS (1 << 12)
#define WV_MAX_SAMPLES 150000 #define WV_MAX_SAMPLES 150000
enum WP_ID_Flags { enum WP_ID_Flags {