[FFmpeg-cvslog] avcodec/tests/avcodec: Sanity check AVCodec.priv_data_size
Andreas Rheinhardt
git at videolan.org
Sun Sep 26 14:59:31 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Sep 24 04:36:14 2021 +0200| [2b0f29507f40db38e88ec157dcb3acaf43abce65] | committer: Andreas Rheinhardt
avcodec/tests/avcodec: Sanity check AVCodec.priv_data_size
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b0f29507f40db38e88ec157dcb3acaf43abce65
---
libavcodec/tests/avcodec.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
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)
More information about the ffmpeg-cvslog
mailing list