[tracker/tracker-1.0] Revert "tracker-extract: MP3s with ID3v23 tags should not hit infinite loop"



commit c6312c79965c62dfbbf76ef1b4c8eb52062be158
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Jun 9 10:59:55 2014 +0100

    Revert "tracker-extract: MP3s with ID3v23 tags should not hit infinite loop"
    
    This reverts commit a1d73a9582111158b5ea838ef0fd545dc7970c0c.

 src/tracker-extract/tracker-extract-mp3.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 28159c1..554ffdd 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -1774,12 +1774,12 @@ parse_id3v24 (const gchar           *data,
                }
        }
 
-       while (pos < tsize) {
+       while (pos < size) {
                id3v24frame frame;
                size_t csize;
                unsigned short flags;
 
-               if (pos + 10 > tsize) {
+               if (pos + 10 > size) {
                        return;
                }
 
@@ -1902,12 +1902,12 @@ parse_id3v23 (const gchar          *data,
                }
        }
 
-       while (pos < tsize) {
+       while (pos < size) {
                id3v24frame frame;
                size_t csize;
                unsigned short flags;
 
-               if (pos + 10 > tsize) {
+               if (pos + 10 > size) {
                        return;
                }
 
@@ -1929,7 +1929,7 @@ parse_id3v23 (const gchar          *data,
                        continue;
                }
 
-               if (pos + csize > tsize) {
+               if (pos + csize > size) {
                        break;
                } else if (csize == 0) {
                        continue;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]