[GNUnet-SVN] r6046 - Extractor/src/plugins

[gnunet]

Author: holindho
Date: 2007-12-27 04:12:01 -0700 (Thu, 27 Dec 2007)
New Revision: 6046

Modified:
   Extractor/src/plugins/flvextractor.c
Log:
clean up, make parser more strict


Modified: Extractor/src/plugins/flvextractor.c
===================================================================
--- Extractor/src/plugins/flvextractor.c        2007-12-27 11:06:53 UTC (rev 
6045)
+++ Extractor/src/plugins/flvextractor.c        2007-12-27 11:12:01 UTC (rev 
6046)
@@ -27,6 +27,8 @@
 
 #define DEBUG 0
 
+#define FLV_SIGNATURE "FLV"
+
 static struct EXTRACTOR_Keywords *
 addKeyword (EXTRACTOR_KeywordType type,
             char *keyword, struct EXTRACTOR_Keywords *next)
@@ -107,6 +109,8 @@
   hdr->version = *ptr++;
   hdr->flags = *ptr++;
   hdr->offset = readBEInt32(&ptr);
+  if (hdr->offset != FLV_HEADER_SIZE)
+    return -1;
 
   *data = ptr;
   return 0;
@@ -319,7 +323,7 @@
   if (readFLVHeader(&ptr, end, &header) == -1)
     return prev;
 
-  if (memcmp(header.signature, "FLV", 3) != 0)
+  if (memcmp(header.signature, FLV_SIGNATURE, 3) != 0)
     return prev;
 
   result = prev;