I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

handle poorly formatted packets more gracefully (in case someone uses the wrong streaming lib *cough*)

Browse Source
This commit is contained in:
jrandom
2004-11-20 02:40:57 +00:00
committed by zzz
parent 0b48b18e7e
commit 21506c1d1b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/streaming/java/src/net/i2p/client/streaming/Packet.java
View File

@ -399,6 +399,10 @@ public class Packet {
* @throws IllegalArgumentException if the data is b0rked * @throws IllegalArgumentException if the data is b0rked
*/ */
public void readPacket(byte buffer[], int offset, int length) throws IllegalArgumentException { public void readPacket(byte buffer[], int offset, int length) throws IllegalArgumentException {
if (buffer.length - offset < length)
throw new IllegalArgumentException("len=" + buffer.length + " off=" + offset + " length=" + length);
if (length < 22) // min header size
throw new IllegalArgumentException("Too small: len=" + buffer.length);
int cur = offset; int cur = offset;
_sendStreamId = new byte[4]; _sendStreamId = new byte[4];
System.arraycopy(buffer, cur, _sendStreamId, 0, 4); System.arraycopy(buffer, cur, _sendStreamId, 0, 4);
@ -412,6 +416,8 @@ public class Packet {
cur += 4; cur += 4;
int numNacks = (int)DataHelper.fromLong(buffer, cur, 1); int numNacks = (int)DataHelper.fromLong(buffer, cur, 1);
cur++; cur++;
if (length < 22 + numNacks*4)
throw new IllegalArgumentException("Too small with " + numNacks + " nacks: " + length);
if (numNacks > 0) { if (numNacks > 0) {
_nacks = new long[numNacks]; _nacks = new long[numNacks];
for (int i = 0; i < numNacks; i++) { for (int i = 0; i < numNacks; i++) {
@ -428,6 +434,11 @@ public class Packet {
int optionSize = (int)DataHelper.fromLong(buffer, cur, 2); int optionSize = (int)DataHelper.fromLong(buffer, cur, 2);
cur += 2; cur += 2;
if (length < 22 + numNacks*4 + optionSize)
throw new IllegalArgumentException("Too small with " + numNacks + " nacks and "
+ optionSize + " options: " + length);
int payloadBegin = cur + optionSize; int payloadBegin = cur + optionSize;
int payloadSize = length - payloadBegin; int payloadSize = length - payloadBegin;
if ( (payloadSize < 0) || (payloadSize > MAX_PAYLOAD_SIZE) ) if ( (payloadSize < 0) || (payloadSize > MAX_PAYLOAD_SIZE) )