diff --git a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java index 5384154d1..9ba79f564 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java +++ b/apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java @@ -21,6 +21,7 @@ package org.klomp.snark.bencode; import java.io.EOFException; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigInteger; @@ -232,10 +233,8 @@ public class BDecoder if (c == '-') { - c = read(); - if (c == '0') - throw new InvalidBEncodingException("Negative zero not allowed"); chars.append((char)c); + c = read(); } if (c < '1' || c > '9') @@ -376,4 +375,21 @@ public class BDecoder return result; } + /** + * prints out the decoded data + * @since 0.9.14 + */ + public static void main(String[] args) { + if (args.length != 1) { + System.err.println("Usage: BDecoder file.torrent"); + System.exit(1); + } + try { + BEValue bev = bdecode(new FileInputStream(args[0])); + System.out.println(bev.toString()); + } catch (IOException ioe) { + ioe.printStackTrace(); + System.exit(1); + } + } } diff --git a/history.txt b/history.txt index d3f6cbbc7..89e0e109c 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2014-06-10 zzz + * i2psnark: Fix decoding of negative numbers (ticket #1307) + * NewsFetcher: Only treat correct status codes as success + 2014-06-09 zzz * i2psnark: - Show client version if available diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4e28a2c8d..c10128fe6 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 5; + public final static long BUILD = 6; /** for example "-test" */ public final static String EXTRA = "";