diff mbox series

[FFmpeg-devel,06/11] avcodec/tests/avcodec: Sanity check AVCodec.priv_data_size

Message ID PR3PR03MB6665C0F053A784500E957E4C8FA49@PR3PR03MB6665.eurprd03.prod.outlook.com
State Accepted
Commit 2b0f29507f40db38e88ec157dcb3acaf43abce65
Headers show
Series [FFmpeg-devel,01/11] avcodec/tests/utils: Rename to avcodec
Related show

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 24, 2021, 4:37 p.m. UTC
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/tests/avcodec.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
diff mbox series

Patch

diff --git a/libavcodec/tests/avcodec.c b/libavcodec/tests/avcodec.c
index 3eb4372019..5512ae99f7 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)