_gnutls_hex2bin: refuse to decode odd-sized hex data

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/str.c b/lib/str.c
index 7a04c78985..dbe8feffc4 100644
--- a/lib/str.c
+++ b/lib/str.c
@@ -513,6 +513,9 @@ _gnutls_hex2bin(const char *hex_data, size_t hex_size, uint8_t * bin_data,
 			return GNUTLS_E_SHORT_MEMORY_BUFFER;
 		}
 
+		if (i+1 >= hex_size)
+			return gnutls_assert_val(GNUTLS_E_PARSING_ERROR);
+
 		hex2_data[0] = hex_data[i];
 		hex2_data[1] = hex_data[i + 1];
 		i += 2;