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

Small fix for edge cases in HelloMessage

This commit is contained in:
romanman 2014-06-03 12:35:11 +03:00
parent dbc2bbc7f2
commit d348b552b3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ethereumj-core/src/main/java/org/ethereum/net/message/HelloMessage.java
View File

@ -8,6 +8,7 @@ import org.ethereum.util.RLP;
import org.ethereum.util.RLPItem; import org.ethereum.util.RLPItem;
import org.ethereum.util.RLPList; import org.ethereum.util.RLPList;
import java.math.BigInteger;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
/** /**
@ -54,11 +55,12 @@ public class HelloMessage extends Message {
byte[] networkIdBytes = ((RLPItem) paramsList.get(2)).getRLPData(); byte[] networkIdBytes = ((RLPItem) paramsList.get(2)).getRLPData();
this.networkId = networkIdBytes == null ? 0 : networkIdBytes[0] ; this.networkId = networkIdBytes == null ? 0 : networkIdBytes[0] ;
this.clientId = new String(((RLPItem) paramsList.get(3)).getRLPData()); byte[] idData = ((RLPItem) paramsList.get(3)).getRLPData();
this.clientId = new String(idData != null ? idData : new byte[0]);
this.capabilities = ((RLPItem) paramsList.get(4)).getRLPData()[0]; this.capabilities = ((RLPItem) paramsList.get(4)).getRLPData()[0];
ByteBuffer bb = ByteBuffer.wrap(((RLPItem) paramsList.get(5)).getRLPData()); ByteBuffer bb = ByteBuffer.wrap(((RLPItem) paramsList.get(5)).getRLPData());
this.peerPort = bb.getShort(); this.peerPort = new BigInteger(bb.array()).shortValue();
this.peerId = ((RLPItem) paramsList.get(6)).getRLPData(); this.peerId = ((RLPItem) paramsList.get(6)).getRLPData();
this.parsed = true; this.parsed = true;
// todo: what to do when mal data ? // todo: what to do when mal data ?