summaryrefslogtreecommitdiffstats
path: root/crypto/asn1/a_object.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-08-02 00:45:31 +0100
committerDr. Stephen Henson <steve@openssl.org>2016-08-02 13:40:32 +0100
commit56f9953c846204cb3251ab27605e403c7444fd72 (patch)
treefd3042f628c99a93a3b3dd7a0d10f2c2579b5581 /crypto/asn1/a_object.c
parente9f17097e9fbba3e7664cd67e54eebf2bd438863 (diff)
Check for overlows and error return from ASN1_object_size()
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/asn1/a_object.c')
-rw-r--r--crypto/asn1/a_object.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c
index 463469d188..6fc7681c23 100644
--- a/crypto/asn1/a_object.c
+++ b/crypto/asn1/a_object.c
@@ -26,7 +26,7 @@ int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp)
return (0);
objsize = ASN1_object_size(0, a->length, V_ASN1_OBJECT);
- if (pp == NULL)
+ if (pp == NULL || objsize == -1)
return objsize;
p = *pp;