Commit a1f6ffd4 authored by Reimar Döffinger's avatar Reimar Döffinger

Change CHECK_STREAM_PTR macro to correctly handle the (extremely unlikely)

overflow case.

Originally committed as revision 18224 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3017d8e9
...@@ -76,7 +76,7 @@ typedef struct IpvideoContext { ...@@ -76,7 +76,7 @@ typedef struct IpvideoContext {
} IpvideoContext; } IpvideoContext;
#define CHECK_STREAM_PTR(n) \ #define CHECK_STREAM_PTR(n) \
if ((s->stream_ptr + n) > s->stream_end) { \ if (s->stream_end - s->stream_ptr < n) { \
av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \ av_log(s->avctx, AV_LOG_ERROR, "Interplay video warning: stream_ptr out of bounds (%p >= %p)\n", \
s->stream_ptr + n, s->stream_end); \ s->stream_ptr + n, s->stream_end); \
return -1; \ return -1; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment