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_0_2h~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=66e731ab09f2c652d0e179df3df10d069b407604;p=oweals%2Fopenssl.git

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>
(cherry picked from commit b33d1141b6dcce947708b984c5e9e91dad3d675d)
---

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index d317f3af25..500c9dfa54 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) {