diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-08-17 16:02:18 +0200 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-09-14 23:53:03 +0200 |
| commit | a46c9789ce2aecedceef119e9883513c7a49f1ca (patch) | |
| tree | efd119b8addcab9b5e16870dd4dff7da1192bfc6 /crypto/asn1/x_x509.c | |
| parent | df6da24bda457b724ba3e894e6c329a9b93d536f (diff) | |
| download | openssl-a46c9789ce2aecedceef119e9883513c7a49f1ca.tar.gz | |
d2i: don't update input pointer on failure
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
MR #1005
Diffstat (limited to 'crypto/asn1/x_x509.c')
| -rw-r--r-- | crypto/asn1/x_x509.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index 6e7850cc05..d8d55b2ee1 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -177,16 +177,17 @@ X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length) if (!a || *a == NULL) { freeret = 1; } - ret = d2i_X509(a, pp, length); + ret = d2i_X509(a, &q, length); /* If certificate unreadable then forget it */ if (!ret) return NULL; /* update length */ - length -= *pp - q; + length -= q - *pp; if (!length) return ret; - if (!d2i_X509_CERT_AUX(&ret->aux, pp, length)) + if (!d2i_X509_CERT_AUX(&ret->aux, &q, length)) goto err; + *pp = q; return ret; err: if (freeret) { |