armv4l/float_arm_vfp.o must be added to OBJS-$(HAVE_ARMVFP) list since

[ffmpeg] / libavformat / oggparsevorbis.c

diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 4cbf8fe42227ddb3a6c05445ac5e191bbe6fd3c2..29e6d91b685cd72b7130568a1b154cca51ace952 100644 (file)
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -23,50 +23,43 @@
 **/
 
 #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;
+    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 */
         return -1;
 
-    s = AV_RL32(p);
-    p += 4;
-    size -= 4;
+    s = bytestream_get_le32(&p);
 
-    if (size - 4 < s)
+    if (end - p < s)
         return -1;
 
     p += s;
-    size -= s;
 
-    n = AV_RL32(p);
-    p += 4;
-    size -= 4;
+    n = bytestream_get_le32(&p);
 
-    while (size >= 4) {
-        char *t, *v;
+    while (p < end && n > 0) {
+        const char *t, *v;
         int tl, vl;
 
-        s = AV_RL32(p);
-        p += 4;
-        size -= 4;
+        s = bytestream_get_le32(&p);
 
-        if (size < s)
+        if (end - p < s)
             break;
 
         t = p;
         p += s;
-        size -= s;
         n--;
 
         v = memchr(t, '=', s);
@@ -106,8 +99,8 @@ vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
         }
     }
 
-    if (size > 0)
-        av_log(as, AV_LOG_INFO, "%i bytes of comment header remain\n", size);
+    if (p != end)
+        av_log(as, AV_LOG_INFO, "%ti bytes of comment header remain\n", p-end);
     if (n > 0)
         av_log(as, AV_LOG_INFO,
                "truncated comment header, %i comments not found\n", n);
@@ -183,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)