aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-05 17:14:36 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-14 16:51:01 +0100
commitece3912daf656651b092f2362f62203594418a3a (patch)
treecc1b5f2e9b304927154798f5b8a81ae84d724b77
parentd092b7f04ca8dfb977343aa12289b6b6123260ea (diff)
downloadffmpeg-ece3912daf656651b092f2362f62203594418a3a.tar.gz
avcodec/dirac_parser: Add basic validity checks for next_pu_offset and prev_pu_offset
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c7d6ec947c053699950af90f695413a5640b3872) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dirac_parser.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/dirac_parser.c b/libavcodec/dirac_parser.c
index 12f1a60145..c7c4b697c8 100644
--- a/libavcodec/dirac_parser.c
+++ b/libavcodec/dirac_parser.c
@@ -114,6 +114,15 @@ static int unpack_parse_unit(DiracParseUnit *pu, DiracParseContext *pc,
if (pu->pu_type == 0x10 && pu->next_pu_offset == 0)
pu->next_pu_offset = 13;
+ if (pu->next_pu_offset && pu->next_pu_offset < 13) {
+ av_log(NULL, AV_LOG_ERROR, "next_pu_offset %d is invalid\n", pu->next_pu_offset);
+ return 0;
+ }
+ if (pu->prev_pu_offset && pu->prev_pu_offset < 13) {
+ av_log(NULL, AV_LOG_ERROR, "prev_pu_offset %d is invalid\n", pu->prev_pu_offset);
+ return 0;
+ }
+
return 1;
}