PR: 631

Submitted by: Doug Sauder <dws+001@hunnysoft.com>

Fix bug in X509V3_get_d2i() when idx in not NULL.

diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c
index 482ca8ccf5d503905d6b28daaf0d6da488388bdb..ca5a4a4a5709a27699f78ad12e0cf8cf8977420c 100644 (file)
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509v3/v3_lib.c
@@ -202,6 +202,7 @@ void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit, int *idx)
                if(OBJ_obj2nid(ex->object) == nid) {
                        if(idx) {
                                *idx = i;
                if(OBJ_obj2nid(ex->object) == nid) {
                        if(idx) {
                                *idx = i;

+                               found_ex = ex;

                                break;
                        } else if(found_ex) {
                                /* Found more than one */
                                break;
                        } else if(found_ex) {
                                /* Found more than one */