[GNUnet-SVN] r7479 - GNUnet/src/applications/datastore

[gnunet]

Author: grothoff
Date: 2008-07-19 22:59:18 -0600 (Sat, 19 Jul 2008)
New Revision: 7479

Modified:
   GNUnet/src/applications/datastore/datastore.c
Log:
fix

Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c       2008-07-20 04:45:17 UTC 
(rev 7478)
+++ GNUnet/src/applications/datastore/datastore.c       2008-07-20 04:59:18 UTC 
(rev 7479)
@@ -569,7 +569,6 @@
       GNUNET_free (lq);
       return;                   /* no change */
     }
-  GNUNET_free_non_null (lq);
   /* ok, need to convert! */
   deleteFilter (uapi->ectx, uapi->cfg);
   initFilters (uapi->ectx, uapi->cfg);
@@ -580,7 +579,7 @@
                _("Starting datastore conversion (this may take a while).\n"));
       pi.start = GNUNET_get_time ();
       pi.pos = 0;
-      pi.total = GNUNET_ntohll (*lq);
+      pi.total = (lq != NULL) ? GNUNET_ntohll (*lq) : 0;
       if (pi.total == 0)
         pi.total = 1;
       sq->iterateAllNow (&filterAddAll, &pi);
@@ -595,6 +594,7 @@
                      _
                      ("Failed to load sqstore service.  Check your 
configuration!\n"));
     }
+  GNUNET_free_non_null (lq);
   sq = NULL;
   doneFilters ();
   if (state != NULL)