From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 13 Mar 2017 19:08:52 +0000 (+0100)
Subject: allow use of NULL for stirings
X-Git-Tag: gnunet-0.11.0rc0~281^2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=75c1a7d1310c1baa452e99fe3968939b9edfab53;p=oweals%2Fgnunet.git

allow use of NULL for stirings
---

diff --git a/src/sq/sq_query_helper.c b/src/sq/sq_query_helper.c
index a04b4ced4..94a3a3f1c 100644
--- a/src/sq/sq_query_helper.c
+++ b/src/sq/sq_query_helper.c
@@ -90,6 +90,14 @@ bind_string (void *cls,
              sqlite3_stmt *stmt,
              unsigned int off)
 {
+  if (NULL == data)
+  {
+    if (SQLITE_OK !=
+        sqlite3_bind_null (stmt,
+                           (int) off))
+      return GNUNET_SYSERR;
+    return GNUNET_OK;
+  }
   if (SQLITE_OK !=
       sqlite3_bind_text (stmt,
                          (int) off,
diff --git a/src/sq/sq_result_helper.c b/src/sq/sq_result_helper.c
index fad3f3c8d..9579863b2 100644
--- a/src/sq/sq_result_helper.c
+++ b/src/sq/sq_result_helper.c
@@ -228,6 +228,13 @@ extract_utf8_string (void *cls,
   const char *text;
   char **rdst = dst;
 
+  if (SQLITE_NULL ==
+      sqlite3_column_type (result,
+                           column))
+  {
+    *rdst = NULL;
+    return GNUNET_OK;
+  }
   if (SQLITE_TEXT !=
       sqlite3_column_type (result,
                            column))