Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-08 22:13:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

proper bounds check

Browse source
This commit is contained in:
Jeff Becker 2018-01-03 10:02:11 -05:00
parent 1967dee50c
commit 80149342f2
No known key found for this signature in database
GPG key ID: F357B3B42F6F9B05
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libi2pd/Garlic.cpp
View file

@ -538,7 +538,7 @@ namespace garlic
{ {
case eGarlicDeliveryTypeLocal: case eGarlicDeliveryTypeLocal:
LogPrint (eLogDebug, "Garlic: type local"); LogPrint (eLogDebug, "Garlic: type local");
if (offset > (int)len) if (offset > (int)len || offset <= 0)
{ {
LogPrint (eLogError, "Garlic: message is too short"); LogPrint (eLogError, "Garlic: message is too short");
break; break;
@ -549,7 +549,7 @@ namespace garlic
LogPrint (eLogDebug, "Garlic: type destination"); LogPrint (eLogDebug, "Garlic: type destination");
buf += 32; // destination. check it later or for multiple destinations buf += 32; // destination. check it later or for multiple destinations
offset = buf1 - buf; offset = buf1 - buf;
if (offset > (int)len) if (offset > (int)len || offset <= 0)
{ {
LogPrint (eLogError, "Garlic: message is too short"); LogPrint (eLogError, "Garlic: message is too short");
break; break;
@ -563,7 +563,7 @@ namespace garlic
uint8_t * gwHash = buf; uint8_t * gwHash = buf;
buf += 32; buf += 32;
offset = buf1 - buf; offset = buf1 - buf;
if (offset + 4 > (int)len) if (offset + 4 > (int)len || offset <= 0)
{ {
LogPrint (eLogError, "Garlic: message is too short"); LogPrint (eLogError, "Garlic: message is too short");
break; break;
@ -594,7 +594,7 @@ namespace garlic
offset = buf1 - buf; offset = buf1 - buf;
if (!from) // received directly if (!from) // received directly
{ {
if (offset > (int)len) if (offset > (int)len || offset <= 0)
{ {
LogPrint (eLogError, "Garlic: message is too short"); LogPrint (eLogError, "Garlic: message is too short");
break; break;
@ -609,7 +609,7 @@ namespace garlic
default: default:
LogPrint (eLogWarning, "Garlic: unknown delivery type ", (int)deliveryType); LogPrint (eLogWarning, "Garlic: unknown delivery type ", (int)deliveryType);
} }
if (offset > (int)len) if (offset > (int)len || offset <= 0)
{ {
LogPrint (eLogError, "Garlic: message is too short"); LogPrint (eLogError, "Garlic: message is too short");
break; break;
@ -619,7 +619,7 @@ namespace garlic
buf += 8; // Date buf += 8; // Date
buf += 3; // Certificate buf += 3; // Certificate
offset = buf1 - buf; offset = buf1 - buf;
if (offset > (int)len) if (offset > (int)len || offset <= 0)
{ {
LogPrint (eLogError, "Garlic: clove is too long"); LogPrint (eLogError, "Garlic: clove is too long");
break; break;