[GNUnet-SVN] r11975 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-06-27 15:13:07 +0200 (Sun, 27 Jun 2010)
New Revision: 11975

Modified:
   gnunet/src/fs/fs_directory.c
Log:
properly check for gnd files

Modified: gnunet/src/fs/fs_directory.c
===================================================================
--- gnunet/src/fs/fs_directory.c        2010-06-27 12:46:48 UTC (rev 11974)
+++ gnunet/src/fs/fs_directory.c        2010-06-27 13:13:07 UTC (rev 11975)
@@ -201,10 +201,16 @@
   struct GNUNET_CONTAINER_MetaData *md;
   char *filename;
 
+  if ( (offset == 0) &&
+       ( (size < 8 + sizeof (uint32_t)) ||
+        (0 != memcmp (cdata, GNUNET_FS_DIRECTORY_MAGIC, 8)) ) )
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                 _("MAGIC mismatch.  This is not a GNUnet directory.\n"));
+      return GNUNET_SYSERR;
+    }
   pos = offset;
-  if ( (pos == 0) && 
-       (size >= 8 + sizeof (uint32_t)) &&
-       (0 == memcmp (cdata, GNUNET_FS_DIRECTORY_MAGIC, 8)) )
+  if (offset == 0) 
     {
       memcpy (&mdSize, &cdata[8], sizeof (uint32_t));
       mdSize = ntohl (mdSize);