d2i: don't update input pointer on failure

[openssl.git] / crypto / asn1 / x_x509.c

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 6e7850cc050228e10b7108f2b4c80700663e1bf1..d8d55b2ee1e64c7d2ed7aeadf8ac52774bab6f5d 100644 (file)
--- 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) {