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

[gnunet]

Author: grothoff
Date: 2012-03-15 14:01:56 +0100 (Thu, 15 Mar 2012)
New Revision: 20527

Modified:
   gnunet/src/fs/fs_api.c
   gnunet/src/fs/fs_download.c
Log:
-check return values, fix leak

Modified: gnunet/src/fs/fs_api.c
===================================================================
--- gnunet/src/fs/fs_api.c      2012-03-15 12:59:28 UTC (rev 20526)
+++ gnunet/src/fs/fs_api.c      2012-03-15 13:01:56 UTC (rev 20527)
@@ -1985,6 +1985,7 @@
     GNUNET_break (0);
     goto cleanup;
   }
+  uris = NULL;
   if ((GNUNET_OK !=
        GNUNET_BIO_read_string (rh, "unindex-fn", &uc->filename, 10 * 1024)) ||
       (GNUNET_OK != GNUNET_BIO_read_int64 (rh, &uc->file_size)) ||
@@ -1994,6 +1995,7 @@
       (GNUNET_OK != GNUNET_BIO_read_string (rh, "unindex-kskuri", &uris, 10 * 
1024)) ||
       (GNUNET_OK != GNUNET_BIO_read_int32 (rh, &uc->ksk_offset)) )
   {
+    GNUNET_free_non_null (uris);
     GNUNET_break (0);
     goto cleanup;
   }

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2012-03-15 12:59:28 UTC (rev 20526)
+++ gnunet/src/fs/fs_download.c 2012-03-15 13:01:56 UTC (rev 20527)
@@ -2068,7 +2068,7 @@
   {
     dc->filename = GNUNET_strdup (filename);
     if (GNUNET_YES == GNUNET_DISK_file_test (filename))
-      GNUNET_DISK_file_size (filename, &dc->old_file_size, GNUNET_YES);
+      GNUNET_break (GNUNET_OK == GNUNET_DISK_file_size (filename, 
&dc->old_file_size, GNUNET_YES));
   }
   if (GNUNET_FS_uri_test_loc (dc->uri))
     GNUNET_assert (GNUNET_OK ==
@@ -2178,7 +2178,7 @@
   {
     dc->filename = GNUNET_strdup (filename);
     if (GNUNET_YES == GNUNET_DISK_file_test (filename))
-      GNUNET_DISK_file_size (filename, &dc->old_file_size, GNUNET_YES);
+      GNUUNET_break (GNUNET_OK == GNUNET_DISK_file_size (filename, 
&dc->old_file_size, GNUNET_YES));
   }
   if (GNUNET_FS_uri_test_loc (dc->uri))
     GNUNET_assert (GNUNET_OK ==