diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 22:37:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 22:37:46 +0100 |
| commit | 1b3b018aa4e43d7bf87df5cdf28c69a9ad5a6cbc (patch) | |
| tree | a2d28eb75316c64d9a4358ecad10ad61adc18abe /libavformat | |
| parent | 29db8e45fc417215a418a4031d09ced17cf9aa2f (diff) | |
| download | ffmpeg-1b3b018aa4e43d7bf87df5cdf28c69a9ad5a6cbc.tar.gz | |
avformat/mpegts: Fix potential pointer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 9e9ad4765e..a4b6d4d193 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -596,7 +596,7 @@ static inline int get16(const uint8_t **pp, const uint8_t *p_end) int c; p = *pp; - if ((p + 1) >= p_end) + if (1 >= p_end - p) return AVERROR_INVALIDDATA; c = AV_RB16(p); p += 2; @@ -615,7 +615,7 @@ static char *getstr8(const uint8_t **pp, const uint8_t *p_end) len = get8(&p, p_end); if (len < 0) return NULL; - if ((p + len) > p_end) + if (len > p_end - p) return NULL; str = av_malloc(len + 1); if (!str) @@ -2181,7 +2181,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) if (is_start) { /* pointer field present */ len = *p++; - if (p + len > p_end) + if (len > p_end - p) return 0; if (len && cc_ok) { /* write remaining section bytes */ |