Changeset 662fe3e

Timestamp:

Jun 10, 2014 7:54:05 PM (7 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

e692e21d

Parents:

1bf8fd92

Message:

• i2psnark: Fix decoding of negative numbers (ticket #1307)

Files:

• apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java (modified) (3 diffs)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

apps/i2psnark/java/src/org/klomp/snark/bencode/BDecoder.java

@@ -22 +22 @@
 
 import java.io.EOFException;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -233 +234 @@
     if (c == '-')
       {
+        chars.append((char)c);
         c = read();
-        if (c == '0')
-          throw new InvalidBEncodingException("Negative zero not allowed");
-        chars.append((char)c);
       }
 
@@ -377 +376 @@
   }
 
+  /**
+   *  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);
+    }
+  }
 }

history.txt

@@ +1 @@
+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:

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     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" */