REST: nothing triggers rest

[oweals/gnunet.git] / src / my / my_result_helper.c

diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c
index a91a24d900e7f9e493bf399d5aa162d6439d2a01..75a3400144dd12ccb30a6a73f97215436c0534bb 100644 (file)
--- a/src/my/my_result_helper.c
+++ b/src/my/my_result_helper.c
@@ -2,16 +2,20 @@
   This file is part of GNUnet
   Copyright (C) 2014, 2015, 2016 GNUnet e.V.
 
-  GNUnet is free software; you can redistribute it and/or modify it under the
-  terms of the GNU General Public License as published by the Free Software
-  Foundation; either version 3, or (at your option) any later version.
-
-  GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along with
-  GNUnet; see the file COPYING.  If not, If not, see <http://www.gnu.org/licenses/>
+  GNUnet is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License,
+  or (at your option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Affero General Public License for more details.
+ 
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
  * @file my/my_result_helper.c
@@ -46,6 +50,8 @@ pre_extract_varsize_blob (void *cls,
   results[0].buffer = NULL;
   results[0].buffer_length = 0;
   results[0].length = &rs->mysql_bind_output_length;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -73,6 +79,8 @@ post_extract_varsize_blob (void *cls,
   void *buf;
   size_t size;
 
+  if (*results->is_null)
+    return GNUNET_SYSERR;
   size = (size_t) rs->mysql_bind_output_length;
 
   if (rs->mysql_bind_output_length != size)
@@ -169,6 +177,8 @@ pre_extract_fixed_blob (void *cls,
   results[0].buffer_length = rs->dst_size;
   results[0].length = &rs->mysql_bind_output_length;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -194,6 +204,8 @@ post_extract_fixed_blob (void *cls,
                          unsigned int column,
                          MYSQL_BIND *results)
 {
+  if (*results->is_null)
+    return GNUNET_SYSERR;
   if (rs->dst_size != rs->mysql_bind_output_length)
     return GNUNET_SYSERR;
   return GNUNET_OK;
@@ -249,6 +261,8 @@ pre_extract_rsa_public_key (void *cls,
   results[0].buffer_length = 0;
   results[0].length = &rs->mysql_bind_output_length;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -279,6 +293,8 @@ post_extract_rsa_public_key  (void *cls,
   void *buf;
   size_t size;
 
+  if (*results->is_null)
+    return GNUNET_SYSERR;
   size = (size_t) rs->mysql_bind_output_length;
 
   if (rs->mysql_bind_output_length != size)
@@ -379,6 +395,8 @@ pre_extract_rsa_signature (void *cls,
   results[0].buffer_length = 0;
   results[0].length = &rs->mysql_bind_output_length;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -407,6 +425,8 @@ post_extract_rsa_signature (void *cls,
   void *buf;
   size_t size;
 
+  if (*results->is_null)
+    return GNUNET_SYSERR;
   size = (size_t) rs->mysql_bind_output_length;
 
   if (rs->mysql_bind_output_length != size)
@@ -448,7 +468,7 @@ post_extract_rsa_signature (void *cls,
  */
 static void
 clean_rsa_signature (void *cls,
-          struct GNUNET_MY_ResultSpec *rs)
+                     struct GNUNET_MY_ResultSpec *rs)
 {
   struct GNUNET_CRYPTO_RsaSignature **sig = rs->dst;
 
@@ -505,6 +525,8 @@ pre_extract_string (void * cls,
   results[0].buffer_length = 0;
   results[0].length = &rs->mysql_bind_output_length;
   results[0].buffer_type = MYSQL_TYPE_BLOB;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -534,6 +556,11 @@ post_extract_string (void * cls,
 
   if (rs->mysql_bind_output_length != size)
     return GNUNET_SYSERR;
+  if (*results->is_null)
+  {
+    *(void **) rs->dst = NULL;
+    return GNUNET_OK;
+  }
 
   buf = GNUNET_malloc (size);
   results[0].buffer = buf;
@@ -549,7 +576,8 @@ post_extract_string (void * cls,
     GNUNET_free (buf);
     return GNUNET_SYSERR;
   }
-  rs->dst = buf;
+  buf[size] = '\0';
+  *(void **) rs->dst = buf;
   return GNUNET_OK;
 }
 
@@ -627,6 +655,8 @@ pre_extract_uint16 (void *cls,
   results[0].buffer_length = rs->dst_size;
   results[0].length = &rs->mysql_bind_output_length;
   results[0].buffer_type = MYSQL_TYPE_SHORT;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -653,6 +683,8 @@ post_extract_uint16 (void *cls,
 {
   if (rs->dst_size != rs->mysql_bind_output_length)
     return GNUNET_SYSERR;
+  if (*results->is_null)
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -702,6 +734,8 @@ pre_extract_uint32 (void *cls,
   results[0].buffer_length = rs->dst_size;
   results[0].length = &rs->mysql_bind_output_length;
   results[0].buffer_type = MYSQL_TYPE_LONG;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -728,7 +762,9 @@ post_extract_uint32 (void *cls,
                      MYSQL_BIND *results)
 {
   if (rs->dst_size != rs->mysql_bind_output_length)
-      return GNUNET_SYSERR;
+    return GNUNET_SYSERR;
+  if (*results->is_null)
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -773,10 +809,14 @@ pre_extract_uint64 (void *cls,
                     unsigned int column,
                     MYSQL_BIND *results)
 {
+  if (sizeof (uint64_t) != rs->dst_size)
+    return GNUNET_SYSERR;
   results[0].buffer = rs->dst;
   results[0].buffer_length = rs->dst_size;
   results[0].length = &rs->mysql_bind_output_length;
   results[0].buffer_type = MYSQL_TYPE_LONGLONG;
+  results[0].is_null = &rs->is_null;
+  rs->is_null = 0;
 
   return GNUNET_OK;
 }
@@ -801,7 +841,9 @@ post_extract_uint64 (void *cls,
                      unsigned int column,
                      MYSQL_BIND *results)
 {
-  if (rs->dst_size != rs->mysql_bind_output_length)
+  if (sizeof (uint64_t) != rs->dst_size)
+    return GNUNET_SYSERR;
+  if (*results->is_null)
     return GNUNET_SYSERR;
   return GNUNET_OK;
 }
@@ -828,4 +870,4 @@ GNUNET_MY_result_spec_uint64 (uint64_t *u64)
 }
 
 
-/* end of pq_result_helper.c */
+/* end of my_result_helper.c */