return error if frame_offset is negative, prevent segfault

[ffmpeg] / libavformat / oggparsevorbis.c

diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index e60efdaa306e93a7ea897764a3cdfa53ade9d199..29e6d91b685cd72b7130568a1b154cca51ace952 100644 (file)
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -23,18 +23,18 @@
 **/
 
 #include <stdlib.h>
+#include "libavutil/avstring.h"
+#include "libavutil/bswap.h"
+#include "libavcodec/bitstream.h"
+#include "libavcodec/bytestream.h"
 #include "avformat.h"
-#include "bitstream.h"
-#include "bytestream.h"
-#include "bswap.h"
-#include "ogg2.h"
-#include "avstring.h"
+#include "oggdec.h"
 
 extern int
 vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
 {
-    uint8_t *p = buf;
-    uint8_t *end = buf + size;
+    const uint8_t *p = buf;
+    const uint8_t *end = buf + size;
     unsigned s, n, j;
 
     if (size < 8) /* must have vendor_length and user_comment_list_length */
@@ -50,7 +50,7 @@ vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
     n = bytestream_get_le32(&p);
 
     while (p < end && n > 0) {
-        char *t, *v;
+        const char *t, *v;
         int tl, vl;
 
         s = bytestream_get_le32(&p);
@@ -176,7 +176,7 @@ vorbis_header (AVFormatContext * s, int idx)
     priv->packet[os->seq] = av_mallocz(os->psize);
     memcpy(priv->packet[os->seq], os->buf + os->pstart, os->psize);
     if (os->buf[os->pstart] == 1) {
-        uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */
+        const uint8_t *p = os->buf + os->pstart + 7; /* skip "\001vorbis" tag */
         unsigned blocksize, bs0, bs1;
 
         if (os->psize != 30)