From a84d0a67d9be2e318200d59b95bb2174498c036d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 21 Jun 2022 08:24:56 +0200 Subject: [PATCH] get_pf_block_pixels/bytes: ensure >0 ret val Ensure that the above function return value >0 (CID 395232). --- src/video_codec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/video_codec.c b/src/video_codec.c index 53583243d..d042df981 100644 --- a/src/video_codec.c +++ b/src/video_codec.c @@ -526,11 +526,11 @@ int get_pf_block_bytes(codec_t codec) { unsigned int i = (unsigned int) codec; - if (i < sizeof codec_info / sizeof(struct codec_info_t)) { - return codec_info[i].block_size_bytes; - } else { - return 0; + if (i >= sizeof codec_info / sizeof(struct codec_info_t)) { + abort(); } + assert(codec_info[i].block_size_bytes > 0); + return codec_info[i].block_size_bytes; } /// @brief returns @ref codec_info_t::block_size_pixels @@ -538,10 +538,11 @@ int get_pf_block_pixels(codec_t codec) { unsigned int i = (unsigned int) codec; - if (i < sizeof codec_info / sizeof(struct codec_info_t)) { - return codec_info[i].block_size_pixels; + if (i >= sizeof codec_info / sizeof(struct codec_info_t)) { + abort(); } - return 0; + assert(codec_info[i].block_size_pixels > 0); + return codec_info[i].block_size_pixels; } /** @brief Deinterlaces framebuffer.