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-06 12:40:51 +0100
commite5a2128ead24ccafaee1e0bcbe02257f1e123629 (patch)
tree35b2f3e7b1be989562489d3f3930fe7dcbd78bb5
parent142f8308a121051c6e2d3531ea4892018ba67ef3 (diff)
downloadffmpeg-e5a2128ead24ccafaee1e0bcbe02257f1e123629.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 a481b266b3..8d93669292 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;
}