status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add catch overflow for CALLDATALOAD

This commit is contained in:
nicksavers 2014-08-23 22:46:55 +02:00
parent 477394ac49
commit cdbc5f0a25
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ethereumj-core/src/main/java/org/ethereum/vm/ProgramInvokeImpl.java
View File

@ -2,6 +2,7 @@ package org.ethereum.vm;
import org.ethereum.db.Repository;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Map;
@ -134,21 +135,25 @@ public class ProgramInvokeImpl implements ProgramInvoke {
/*****************/
/*** msg data ***/
/*****************/
/* NOTE: In the protocol there is no restriction on the maximum message data,
* However msgData here is a byte[] and this can't hold more than 2^32-1
*/
private static BigInteger MAX_MSG_DATA = BigInteger.valueOf(Integer.MAX_VALUE);
/* CALLDATALOAD op */
public DataWord getDataValue(DataWord indexData) {
byte[] data = new byte[32];
int index = indexData.intValue();
int size = 32;
if (msgData == null) return new DataWord(data);
if (index > msgData.length) return new DataWord(data);
if (index + 32 > msgData.length) size = msgData.length - index ;
BigInteger tempIndex = indexData.value();
int index = tempIndex.intValue(); // possible overflow is caught below
int size = 32; // maximum datavalue size
if (msgData == null || index >= msgData.length
|| tempIndex.compareTo(MAX_MSG_DATA) == 1)
return new DataWord();
if (index + size > msgData.length)
size = msgData.length - index;
byte[] data = new byte[size];
System.arraycopy(msgData, index, data, 0, size);
return new DataWord(data);
}