aargh/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MaskedIPSet: More efficient string generation

Browse Source 
and don't IAE on 8 byte negative value
This commit is contained in:
zzz
2021-12-19 10:53:50 -05:00
parent 1a05083ed0
commit 464a39b939
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
router/java/src/net/i2p/router/util/MaskedIPSet.java
View File

@ -116,7 +116,6 @@ public class MaskedIPSet extends HashSet<String> {
* @param mask is 1-4 (number of bytes to match)
*/
private static String maskedIP(byte[] ip, int mask) {
final StringBuilder buf = new StringBuilder(1 + (mask*2));
final char delim;
if (ip.length == 16) {
mask *= 2;
@ -124,8 +123,14 @@ public class MaskedIPSet extends HashSet<String> {
} else {
delim = '.';
}
final StringBuilder buf = new StringBuilder(1 + (mask*2));
buf.append(delim);
buf.append(Long.toHexString(DataHelper.fromLong(ip, 0, mask)));
for (int i = 0; i < mask; i++) {
// fake hex "0123456789:;<=>?"
byte b = ip[i];
buf.append('0' + (char) ((b >> 4) & 0x0f));
buf.append('0' + (char) (b & 0x0f));
}
return buf.toString();
}