result_size in gnutls_hex_encode behaves as documented. It now holds the size of the result. Reported by John Brooks.

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/gnutls_psk.c b/lib/gnutls_psk.c
index f629fa6f14..6c66bbe2c6 100644
--- a/lib/gnutls_psk.c
+++ b/lib/gnutls_psk.c
@@ -407,14 +407,17 @@ int
 gnutls_hex_encode (const gnutls_datum_t * data, char *result,
 		   size_t * result_size)
 {
-  if (*result_size < data->size + data->size + 1)
+size_t res = data->size + data->size + 1;
+
+  if (*result_size < res)
     {
       gnutls_assert ();
       return GNUTLS_E_SHORT_MEMORY_BUFFER;
     }
 
   _gnutls_bin2hex (data->data, data->size, result, *result_size);
-
+  *result_size = res;
+  
   return 0;
 }