-fix off-by-1

[oweals/gnunet.git] / src / json / json_helper.c

diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index cf84ae997a8872a1f73f29e8736be8888432ac0d..dca2106aae6fa40ecea1676d7a58a38f25dfee62 100644 (file)
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -244,6 +244,7 @@ GNUNET_JSON_spec_string (const char *name,
     .ptr_size = 0,
     .size_ptr = NULL
   };
+  *strptr = NULL;
   return ret;
 }
 
@@ -283,6 +284,7 @@ clean_object (void *cls,
               struct GNUNET_JSON_Specification *spec)
 {
   json_t **ptr = (json_t **) spec->ptr;
+
   if (NULL != *ptr)
   {
     json_decref (*ptr);
@@ -310,6 +312,7 @@ GNUNET_JSON_spec_json (const char *name,
     .ptr_size = 0,
     .size_ptr = NULL
   };
+  *jsonp = NULL;
   return ret;
 }
 
@@ -690,7 +693,7 @@ parse_rsa_public_key (void *cls,
                       json_t *root,
                       struct GNUNET_JSON_Specification *spec)
 {
-  struct GNUNET_CRYPTO_rsa_PublicKey **pk = spec->ptr;
+  struct GNUNET_CRYPTO_RsaPublicKey **pk = spec->ptr;
   const char *enc;
   char *buf;
   size_t len;
@@ -736,7 +739,7 @@ static void
 clean_rsa_public_key (void *cls,
                       struct GNUNET_JSON_Specification *spec)
 {
-  struct GNUNET_CRYPTO_rsa_PublicKey **pk = spec->ptr;
+  struct GNUNET_CRYPTO_RsaPublicKey **pk = spec->ptr;
 
   if (NULL != *pk)
   {
@@ -754,7 +757,7 @@ clean_rsa_public_key (void *cls,
  */
 struct GNUNET_JSON_Specification
 GNUNET_JSON_spec_rsa_public_key (const char *name,
-                                 struct GNUNET_CRYPTO_rsa_PublicKey **pk)
+                                 struct GNUNET_CRYPTO_RsaPublicKey **pk)
 {
   struct GNUNET_JSON_Specification ret = {
     .parser = &parse_rsa_public_key,
@@ -765,6 +768,7 @@ GNUNET_JSON_spec_rsa_public_key (const char *name,
     .ptr_size = 0,
     .size_ptr = NULL
   };
+  *pk = NULL;
   return ret;
 }
 
@@ -782,7 +786,7 @@ parse_rsa_signature (void *cls,
                      json_t *root,
                      struct GNUNET_JSON_Specification *spec)
 {
-  struct GNUNET_CRYPTO_rsa_Signature **sig = spec->ptr;
+  struct GNUNET_CRYPTO_RsaSignature **sig = spec->ptr;
   size_t size;
   const char *str;
   int res;
@@ -828,7 +832,7 @@ static void
 clean_rsa_signature (void *cls,
                      struct GNUNET_JSON_Specification *spec)
 {
-  struct GNUNET_CRYPTO_rsa_Signature  **sig = spec->ptr;
+  struct GNUNET_CRYPTO_RsaSignature  **sig = spec->ptr;
 
   if (NULL != *sig)
   {
@@ -846,7 +850,7 @@ clean_rsa_signature (void *cls,
  */
 struct GNUNET_JSON_Specification
 GNUNET_JSON_spec_rsa_signature (const char *name,
-                                struct GNUNET_CRYPTO_rsa_Signature **sig)
+                                struct GNUNET_CRYPTO_RsaSignature **sig)
 {
   struct GNUNET_JSON_Specification ret = {
     .parser = &parse_rsa_signature,
@@ -857,6 +861,7 @@ GNUNET_JSON_spec_rsa_signature (const char *name,
     .ptr_size = 0,
     .size_ptr = NULL
   };
+  *sig = NULL;
   return ret;
 }