[tracker] Revert "Revert "Added some extra checks for size in mp3 extraction.""



commit e7b7bf05e0281d6d25440640b322ea08ebda7423
Author: Philip Van Hoof <philip codeminded be>
Date:   Thu May 7 19:25:41 2009 +0200

    Revert "Revert "Added some extra checks for size in mp3 extraction.""
    
    This reverts commit e59d80ec31fcd70f62d7f14a73720ba6b43a537a.
---
 src/tracker-extract/tracker-extract-mp3.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index 699c490..fc74e7c 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -319,10 +319,13 @@ read_id3v1_buffer (int fd, goffset size)
 	guint bytes_read;
 	guint rc;
 
-	if (lseek (fd, size-ID3V1_SIZE, SEEK_SET) < 0) {
+	if (size<128) {
 		return NULL;
 	}
 
+	if (lseek (fd, size-ID3V1_SIZE, SEEK_SET) < 0) {
+		return NULL;
+	}
 
 	buffer = g_malloc (ID3V1_SIZE);
 
@@ -481,6 +484,10 @@ get_id3 (const gchar *data,
 	const gchar *pos;
 	gchar buf[5];
 
+	if (!data) {
+		return FALSE;
+	}
+	
 	if (size < 128) {
 		return FALSE;
 	}



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