[GNUnet-SVN] r9551 - in GNUnet/src/util: boot os

[gnunet]

Author: grothoff
Date: 2009-11-16 05:37:52 -0700 (Mon, 16 Nov 2009)
New Revision: 9551

Modified:
   GNUnet/src/util/boot/startup.c
   GNUnet/src/util/os/cpustatus.c
Log:
check for NULL

Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c      2009-11-16 12:33:54 UTC (rev 9550)
+++ GNUnet/src/util/boot/startup.c      2009-11-16 12:37:52 UTC (rev 9551)
@@ -269,6 +269,14 @@
       size_t max;
 
       bindir = GNUNET_get_installation_path (GNUNET_IPK_BINDIR);
+      if (bindir == NULL)
+       {
+         GNUNET_GE_LOG (*ectx,
+                        GNUNET_GE_ERROR | GNUNET_GE_USER | GNUNET_GE_IMMEDIATE,
+                        _("Failed to determine installation path.   Try 
setting `%s'\n"),
+                        "GNUNET_PREFIX");
+         return -1;
+       }
       max = 128 + strlen (*cfgFileName) + strlen (bindir);
       run = GNUNET_malloc (max);
       GNUNET_snprintf (run,

Modified: GNUnet/src/util/os/cpustatus.c
===================================================================
--- GNUnet/src/util/os/cpustatus.c      2009-11-16 12:33:54 UTC (rev 9550)
+++ GNUnet/src/util/os/cpustatus.c      2009-11-16 12:37:52 UTC (rev 9551)
@@ -675,7 +675,11 @@
 #elif MINGW
   ShutdownWinEnv ();
 #endif
-  GNUNET_mutex_destroy (statusMutex);
+  if (statusMutex != NULL)
+    {
+      GNUNET_mutex_destroy (statusMutex);
+      statusMutex = NULL;
+    }
 }