From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 28 Apr 2016 12:09:27 +0000 (+0100)
Subject: Sanity check buffer length.
X-Git-Tag: OpenSSL_1_1_0-pre6~982
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=b33d1141b6dcce947708b984c5e9e91dad3d675d

Sanity check buffer length.

Reject zero length buffers passed to X509_NAME_onelne().

Issue reported by Guido Vranken.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index ac871b4029..920828373c 100644
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -86,6 +86,8 @@ char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
             goto err;
         b->data[0] = '\0';
         len = 200;
+    } else if (len == 0) {
+        return NULL;
     }
     if (a == NULL) {
         if (b) {