More destinations with extended keys

diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index d77125ceca8ca686f7109e67f1e24e2d7d05203e..183a7b69c95dad91eb82a1f38dc8c98793d949f2 100644 (file)
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -677,11 +677,17 @@ bool ExtractDestinations(const CScript& scriptPubKey,
                     }
                 }
 
-                for (int i = -1; ccValid && i < (int)(p.vData.size() - 1); i++)
+                for (int i = 0; ccValid && i < (int)(p.vData.size() - 1); i++)
                 {
                     // first, process P, then any sub-conditions
                     COptCCParams _oneP;
-                    COptCCParams &oneP = (i == -1) ? p : (_oneP = COptCCParams(p.vData[i]));
+                    COptCCParams &oneP = (i == 0) ? p : (_oneP = COptCCParams(p.vData[i]));
+
+                    ccValid = oneP.IsValid();
+                    if (!ccValid)
+                    {
+                        _oneP = COptCCParams(p.vData[i]);
+                    }
 
                     if (ccValid = oneP.IsValid())
                     {