Merge pull request #925 from ethereum/eip-211

Fix 2 eip-211 implementation issues

ethereumj-core/src/main/java/org/ethereum/vm/program/Program.java

@@ -393,6 +393,7 @@ public Repository getStorage() {
 
     @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
     public void createContract(DataWord value, DataWord memStart, DataWord memSize) {
+        returnDataBuffer = null; // reset return buffer right before the call
 
         if (getCallDeep() == MAX_DEPTH) {
             stackPushZero();
@@ -459,7 +460,6 @@ this, new DataWord(newAddress), getOwnerAddress(), value, gasLimit,
                 newBalance, null, track, this.invoke.getBlockStore(), false, byTestingSuite());
 
         ProgramResult result = ProgramResult.empty();
-        returnDataBuffer = null; // reset return buffer right before the call
 
         if (isNotEmpty(programCode)) {
             VM vm = new VM(config);
@@ -535,6 +535,7 @@ this, new DataWord(newAddress), getOwnerAddress(), value, gasLimit,
      * @param msg is the message call object
      */
     public void callToAddress(MessageCall msg) {
+        returnDataBuffer = null; // reset return buffer right before the call
 
         if (getCallDeep() == MAX_DEPTH) {
             stackPushZero();
@@ -585,8 +586,6 @@ public void callToAddress(MessageCall msg) {
 
         ProgramResult result = null;
         if (isNotEmpty(programCode)) {
-            returnDataBuffer = null; // reset return buffer right before the call
-
             ProgramInvoke programInvoke = programInvokeFactory.createProgramInvoke(
                     this, new DataWord(contextAddress),
                     msg.getType().callIsDelegate() ? getCallerAddress() : getOwnerAddress(),
@@ -1122,6 +1121,7 @@ public int verifyJumpDest(DataWord nextPC) {
     }
 
     public void callToPrecompiledAddress(MessageCall msg, PrecompiledContract contract) {
+        returnDataBuffer = null; // reset return buffer right before the call
 
         if (getCallDeep() == MAX_DEPTH) {
             stackPushZero();
@@ -1175,6 +1175,7 @@ public void callToPrecompiledAddress(MessageCall msg, PrecompiledContract contra
 
             this.memorySave(msg.getOutDataOffs().intValue(), out);
             this.stackPushOne();
+            returnDataBuffer = out;
             track.commit();
         }
     }