fix signed/unsigned comparison

prusnak · prusnak · commit 5c6b47288323 · 2018-10-23T23:34:47.000+02:00
diff --git a/cash_addr.c b/cash_addr.c
@@ -101,7 +101,7 @@ int cash_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input) {
         ++(*data_len);
     }
     hrp_len = input_len - (1 + *data_len);
-    if (hrp_len < 1 || hrp_len > MAX_HRP_SIZE ||
+    if (1 + *data_len >= input_len || hrp_len > MAX_HRP_SIZE ||
         *data_len < CHECKSUM_SIZE || *data_len > CHECKSUM_SIZE + MAX_BASE32_SIZE) {
         return 0;
     }
diff --git a/segwit_addr.c b/segwit_addr.c
@@ -97,7 +97,7 @@ int bech32_decode(char* hrp, uint8_t *data, size_t *data_len, const char *input)
         ++(*data_len);
     }
     hrp_len = input_len - (1 + *data_len);
-    if (hrp_len < 1 || *data_len < 6) {
+    if (1 + *data_len >= input_len || *data_len < 6) {
         return 0;
     }
     *(data_len) -= 6;

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ int cash_decode(char* hrp, uint8_t data, size_t data_len, const char *input) {`
`101`	`101`	`++(*data_len);`
`102`	`102`	`}`
`103`	`103`	`hrp_len = input_len - (1 + *data_len);`
`104`		`- if (hrp_len < 1 \|\| hrp_len > MAX_HRP_SIZE \|\|`
	`104`	`+ if (1 + *data_len >= input_len \|\| hrp_len > MAX_HRP_SIZE \|\|`
`105`	`105`	`data_len < CHECKSUM_SIZE \|\| data_len > CHECKSUM_SIZE + MAX_BASE32_SIZE) {`
`106`	`106`	`return 0;`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ int bech32_decode(char* hrp, uint8_t data, size_t data_len, const char *input)`
`97`	`97`	`++(*data_len);`
`98`	`98`	`}`
`99`	`99`	`hrp_len = input_len - (1 + *data_len);`
`100`		`- if (hrp_len < 1 \|\| *data_len < 6) {`
	`100`	`+ if (1 + data_len >= input_len \|\| data_len < 6) {`
`101`	`101`	`return 0;`
`102`	`102`	`}`
`103`	`103`	`*(data_len) -= 6;`