[GNUnet-SVN] r4001 - in GNUnet: . src/applications/sqstore_mysql

[grothoff]

Author: grothoff
Date: 2006-12-21 16:39:11 -0800 (Thu, 21 Dec 2006)
New Revision: 4001

Modified:
   GNUnet/src/applications/sqstore_mysql/mysql.c
   GNUnet/todo
Log:
fixing Mantis 1156

Modified: GNUnet/src/applications/sqstore_mysql/mysql.c
===================================================================
--- GNUnet/src/applications/sqstore_mysql/mysql.c       2006-12-22 00:20:45 UTC 
(rev 4000)
+++ GNUnet/src/applications/sqstore_mysql/mysql.c       2006-12-22 00:39:11 UTC 
(rev 4001)
@@ -1364,7 +1364,15 @@
                dbh);
       content_size = 0;
     } else {
-      SSCANF(sql_row[0], "%llu", &content_size);
+      if ( (mysql_num_fields(sql_res) != 1) ||
+          (sql_row[0] == NULL) ) {
+       GE_BREAK(ectx, mysql_num_fields(sql_res) == 1);
+       content_size = 0;
+      } else {
+       SSCANF(sql_row[0],
+              "%llu",
+              &content_size);
+      }
     }
     if (sql_res != NULL)
       mysql_free_result(sql_res);

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2006-12-22 00:20:45 UTC (rev 4000)
+++ GNUnet/todo 2006-12-22 00:39:11 UTC (rev 4001)
@@ -13,7 +13,6 @@
 
 
 0.7.1 [12'06] (aka "stabilization")
-- investigate #1156 (mysql crash?) [RC]
 - Windows installer [Nils]
   * uninstall: Remove account
   * libcurl, guile