Merge result of inner CREATE only when all checks passed

ethereum · Aug 12, 2018 · 0507ec1 · 0507ec1
1 parent a47945b
commit 0507ec1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/program/Program.java b/ethereumj-core/src/main/java/org/ethereum/vm/program/Program.java
@@ -475,8 +475,6 @@ this, new DataWord(newAddress), getOwnerAddress(), value, gasLimit,
             Program program = new Program(programCode, programInvoke, internalTx, config).withCommonConfig(commonConfig);
             vm.play(program);
             result = program.getResult();
-
-            getResult().merge(result);
         }
 
         // 4. CREATE THE CONTRACT OUT OF RETURN
@@ -499,6 +497,8 @@ this, new DataWord(newAddress), getOwnerAddress(), value, gasLimit,
             track.saveCode(newAddress, code);
         }
 
+        getResult().merge(result);
+
         if (result.getException() != null || result.isRevert()) {
             logger.debug("contract run halted by Exception: contract: [{}], exception: [{}]",
                     toHexString(newAddress),