[FFmpeg-cvslog] avformat/rtpdec_xiph: Move pkt_len onto one side of the check

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 12 18:07:32 2015 +0200| [a23379a0a68a6dd9a0e0d583e11b0c6f9b33f9ae] | committer: Michael Niedermayer

avformat/rtpdec_xiph: Move pkt_len onto one side of the check

This is more correct
Fixes CID1271793

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a23379a0a68a6dd9a0e0d583e11b0c6f9b33f9ae
---

 libavformat/rtpdec_xiph.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index 8492865..eceb840 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -73,7 +73,7 @@ static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data,
         }
         pkt_len = AV_RB16(data->split_buf + data->split_pos);
         data->split_pos += 2;
-        if (data->split_pos + pkt_len > data->split_buf_len) {
+        if (pkt_len > data->split_buf_len - data->split_pos) {
             av_log(ctx, AV_LOG_ERROR, "Not enough data to return\n");
             return AVERROR_INVALIDDATA;
         }