1 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/libcrypto/asn1/tasn_prn.c b/src/lib/libcrypto/asn1/tasn_prn.c
index b8f7dd5294..9fbf177ba4 100644
--- a/src/lib/libcrypto/asn1/tasn_prn.c
+++ b/src/lib/libcrypto/asn1/tasn_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tasn_prn.c,v 1.17 2018/04/25 11:48:21 tb Exp $ */
+/* $OpenBSD: tasn_prn.c,v 1.18 2019/03/23 18:48:14 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -507,7 +507,12 @@ asn1_primitive_print(BIO *out, ASN1_VALUE **fld, const ASN1_ITEM *it,
                 return 0;
         if (pf && pf->prim_print)
                 return pf->prim_print(out, fld, it, indent, pctx);
+
         str = (ASN1_STRING *)*fld;
+
+        if (str->length < 0)
+                return 0;
+
         if (it->itype == ASN1_ITYPE_MSTRING)
                 utype = str->type & ~V_ASN1_NEG;
         else
@@ -516,7 +521,6 @@ asn1_primitive_print(BIO *out, ASN1_VALUE **fld, const ASN1_ITEM *it,
                 ASN1_TYPE *atype = (ASN1_TYPE *)*fld;
                 utype = atype->type;
                 fld = &atype->value.asn1_value;
-                str = (ASN1_STRING *)*fld;
                 if (pctx->flags & ASN1_PCTX_FLAGS_NO_ANY_TYPE)
                         pname = NULL;
                 else