commit 01238aec4071eabf072f4e98e3fb84cbab3c7107
author Kurt Roeckx <kurt@roeckx.be> Sun Jun 19 14:16:16 2016 +0200
committer Kurt Roeckx <kurt@roeckx.be> Tue Jun 21 20:55:54 2016 +0200
tree a09753990785e9f064b03d3b8181f6b7109ddcdc
parent 28bd8e945ff0bf50183af2481cc36180fbccaedb

buf2hexstr: properly deal with empty string

It wrote before the start of the string

found by afl

Reviewed-by: Richard Levitte <levitte@openssl.org>

MR: #2994

crypto/o_str.c

diff --git a/crypto/o_str.c b/crypto/o_str.c
index 29c324f..beabec0 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -198,7 +198,12 @@
     const unsigned char *p;
     int i;
 
-    if ((tmp = OPENSSL_malloc(len * 3 + 1)) == NULL) {
+    if (len == 0)
+    {
+        return OPENSSL_zalloc(1);
+    }
+
+    if ((tmp = OPENSSL_malloc(len * 3)) == NULL) {
         CRYPTOerr(CRYPTO_F_OPENSSL_BUF2HEXSTR, ERR_R_MALLOC_FAILURE);
         return NULL;
     }