diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-24 04:36:14 +0200 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-09-26 13:29:18 +0200 |
commit | 2b0f29507f40db38e88ec157dcb3acaf43abce65 (patch) | |
tree | bec6cd18ab8a4606d93af745bcd52d22f2d9106f /libavcodec/tests/avcodec.c | |
parent | 5aac4b669a4d0e69ad556eedb6305005198a309d (diff) | |
download | ffmpeg-2b0f29507f40db38e88ec157dcb3acaf43abce65.tar.gz |
avcodec/tests/avcodec: Sanity check AVCodec.priv_data_size
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/tests/avcodec.c')
-rw-r--r-- | libavcodec/tests/avcodec.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c index df7e7129a5..bba6eea77d 100644 --- a/libavcodec/tests/avcodec.c +++ b/libavcodec/tests/avcodec.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/opt.h" #include "libavcodec/codec.h" #include "libavcodec/codec_desc.h" @@ -34,6 +35,25 @@ do { \ #define ERR(msg) ERR_INTERNAL(msg, ) #define ERR_EXT(msg, ...) ERR_INTERNAL(msg, , __VA_ARGS__) +static int priv_data_size_wrong(const AVCodec *codec) +{ + if (codec->priv_data_size < 0 || + codec->priv_class && codec->priv_data_size < sizeof(AVClass*)) + return 1; + if (!codec->priv_class || !codec->priv_class->option) + return 0; + for (const AVOption *opt = codec->priv_class->option; opt->name; opt++) { + if (opt->offset >= codec->priv_data_size || + opt->type == AV_OPT_TYPE_CONST && opt->offset != 0 || + opt->type != AV_OPT_TYPE_CONST && (opt->offset < sizeof(AVClass*) || opt->offset < 0)) { + AV_LOG("Option %s offset %d nonsensical\n", + opt->name, opt->offset); + return 1; + } + } + return 0; +} + int main(void){ void *iter = NULL; const AVCodec *codec = NULL; @@ -92,6 +112,9 @@ int main(void){ if (!!codec->decode + !!codec->receive_frame != 1) ERR("Decoder %s does not implement exactly one decode API.\n"); } + if (priv_data_size_wrong(codec)) + ERR_EXT("Private context of codec %s is impossibly-sized (size %d).", + codec->priv_data_size); if (!(desc = avcodec_descriptor_get(codec->id))) { ERR("Codec %s lacks a corresponding descriptor\n"); } else if (desc->type != codec->type) |