-cleanup

3 files changed, 5 insertions, 3 deletions

diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index 088d765cd..041d35297 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -216,8 +216,8 @@ GNUNET_CRYPTO_ecc_public_key_from_string (const char *enc,
     return GNUNET_SYSERR;
 
   if (GNUNET_OK != GNUNET_STRINGS_string_to_data (enc, enclen,
-                                                 (unsigned char*) pub,
-                                                 sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
+                                                  pub,
+                                                  sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
     return GNUNET_SYSERR;
   if ( (ntohs (pub->size) != sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)) ||
        (ntohs (pub->len) > GNUNET_CRYPTO_ECC_SIGNATURE_DATA_ENCODING_LENGTH) )
diff --git a/src/util/strings.c b/src/util/strings.c
index 91d27d84e..e9b5b3c21 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -804,6 +804,8 @@ GNUNET_STRINGS_data_to_string (const void *data, size_t size, char *out, size_t
     vbit -= 5;
   }
   GNUNET_assert (vbit == 0);
+  if (wpos < out_size)
+    out[wpos] = '\0';
   return &out[wpos];
 }
 
diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c
index daf228ead..d98cd8578 100644
--- a/src/util/test_strings_to_data.c
+++ b/src/util/test_strings_to_data.c
@@ -40,7 +40,7 @@ main (int argc, char *argv[])
         memset (&src, '\1', sizeof (src));
         memset (&dest, '\2', sizeof (dest));
 
-        end = GNUNET_STRINGS_data_to_string (&src, sizeof (src), buf, 255);
+        end = GNUNET_STRINGS_data_to_string (&src, sizeof (src), buf, sizeof (buf));
         end[0] = '\0';
         fprintf (stderr, "Key `%s'\n",buf);
         GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_ecc_public_key_from_string (buf, strlen (buf), &dest));