Changeset 1141

Timestamp:

03/06/10 11:35:37 (2 years ago)

Author:

rakshasa

Message:

* Fixed a bug in reading bencoded data. #2112

Location:

trunk/libtorrent

Files:

• src/protocol/extensions.cc (modified) (2 diffs)
• src/protocol/extensions.h (modified) (2 diffs)
• src/torrent/object_raw_bencode.h (modified) (1 diff)
• src/torrent/object_stream.cc (modified) (11 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/torrent/object_static_map_test.cc (modified) (6 diffs)
• test/torrent/object_static_map_test.h (modified) (4 diffs)
• test/torrent/object_stream_test.cc (modified) (1 diff)

trunk/libtorrent/src/protocol/extensions.cc

@@ -46 +46 @@
 #include "protocol/peer_connection_base.h"
 #include "torrent/connection_manager.h"
-#include "torrent/object.h"
 #include "torrent/object_stream.h"
 #include "torrent/peer/connection_list.h"
 #include "torrent/peer/peer_info.h"
-#include "torrent/object_static_map.h"
 #include "manager.h"
 
@@ -56 +54 @@
 
 namespace torrent {
-
-enum ext_handshake_keys {
-  key_e,
-  key_m_utPex,
-  key_p,
-  key_reqq,
-  key_v,
-  key_handshake_LAST
-};
-
-enum ext_pex_keys {
-  key_pex_added,
-  key_pex_LAST
-};
-
-typedef static_map_type<ext_handshake_keys, key_handshake_LAST> ExtHandshakeMessage;
-typedef static_map_type<ext_pex_keys, key_pex_LAST> ExtPEXMessage;
 
 template <>

trunk/libtorrent/src/protocol/extensions.h

@@ -41 +41 @@
 #include <vector>
 
-#include <torrent/exceptions.h>
-#include <torrent/object.h>
+#include "torrent/exceptions.h"
+#include "torrent/object.h"
+#include "torrent/object_static_map.h"
 
 #include "download/download_info.h"
@@ -156 +157 @@
   char*               m_readPos;
 };
+
+//
+// 
+//
+
+enum ext_handshake_keys {
+  key_e,
+  key_m_utPex,
+  key_p,
+  key_reqq,
+  key_v,
+  key_handshake_LAST
+};
+
+enum ext_pex_keys {
+  key_pex_added,
+  key_pex_LAST
+};
+
+typedef static_map_type<ext_handshake_keys, key_handshake_LAST> ExtHandshakeMessage;
+typedef static_map_type<ext_pex_keys, key_pex_LAST> ExtPEXMessage;
+
+//
+//
+//
 
 inline

trunk/libtorrent/src/torrent/object_raw_bencode.h

@@ -38 +38 @@
 #define LIBTORRENT_OBJECT_RAW_BENCODE_H
 
+#include <algorithm>
 #include <string>
 #include <cstring>

trunk/libtorrent/src/torrent/object_stream.cc

@@ -39 +39 @@
 #include <iterator>
 #include <iostream>
+#include <cmath>
+#include <limits>
 #include <rak/algorithm.h>
 #include <rak/functional.h>
@@ -212 +214 @@
     first = object_read_bencode_c_value(first + 1, last, object->as_value());
 
-    if (first == NULL || first == last || *first++ != 'e')
+    if (first == last || *first++ != 'e')
       break;
 
@@ -224 +226 @@
     *object = Object::create_list();
 
-    while (first != NULL && first != last) {
+    while (first != last) {
       if (*first == 'e')
         return first + 1;
@@ -249 +251 @@
     Object::string_type prev;
 
-    while (first != NULL && first != last) {
+    while (first != last) {
       if (*first == 'e')
         return first + 1;
@@ -348 +350 @@
   first = object_read_bencode_skip_c(first, last);
 
-  if (first == NULL)
-    return first;
-
   raw_bencode obj = raw_bencode(tmp, std::distance(tmp, first));
 
-  if (obj.is_empty())
-    return NULL;
+//   if (obj.is_empty())
+//     throw torrent::bencode_error("Invalid bencode data.");
 
   switch (type) {
@@ -644 +643 @@
 //       sprintf(buffer, "Verified wrong, %u, '%u', '%s'.", std::distance(first, last), (unsigned int)*first, escaped.c_str());
 
-//       throw torrent::bencode_error("Invalid bencode data.");
+//       throw torrent::internal_error("Invalid bencode data.");
 //     }
 //   }
@@ -657 +656 @@
   char current_key[static_map_mapping_type::max_key_size + 2] = "";
 
-  while (first != last && first != NULL) {
+  while (first != last) {
     // End a dictionary/list or the whole stream.
     if (*first == 'e') {
@@ -666 +665 @@
 
       stack_itr--;
+      continue;
     }
 
@@ -717 +717 @@
       // The bencode object isn't a list. This should either skip it
       // or produce an error.
-      if (*first++ != 'd')
-        throw torrent::bencode_error("Invalid bencode data.");
+      if (*first++ != 'd') {
+        first = object_read_bencode_skip_c(first - 1, last);
+        break;
+      }
 
       stack_itr++;
@@ -734 +736 @@
       // The bencode object isn't a list. This should either skip it
       // or produce an error.
-      if (*first++ != 'l')
-        throw torrent::bencode_error("Invalid bencode data.");
+      if (*first++ != 'l') {
+        first = object_read_bencode_skip_c(first - 1, last);
+        break;
+      }
 
       first_key = key_search.first;
@@ -746 +750 @@
 
         if (first_key->key[key_search.second + 2] == '*') {
-          if ((first = object_read_bencode_raw_c(first, last,
-                                                 &entry_values[first_key->index].object,
-                                                 key_search.first->key[key_search.second + 1])) == NULL)
-            break;
+          first = object_read_bencode_raw_c(first, last,
+                                            &entry_values[first_key->index].object,
+                                            key_search.first->key[key_search.second + 1]);
         } else {
-          if ((first = object_read_bencode_c(first, last, &entry_values[first_key->index].object)) == NULL)
-            break;
+          first = object_read_bencode_c(first, last, &entry_values[first_key->index].object);
         }
 

trunk/libtorrent/test/Makefile.am

@@ -1 +1 @@
 TESTS = LibTorrentTest
 check_PROGRAMS = $(TESTS)
+LibTorrentTest_LDADD = \
+        ../src/libtorrent.la
+
 LibTorrentTest_SOURCES = \
         rak/allocators_test.cc \
@@ -14 +17 @@
         main.cc
 
-LibTorrentTest_LDADD = \
-        ../src/libtorrent.la
-
 LibTorrentTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
 LibTorrentTest_LDFLAGS = $(CPPUNIT_LIBS)  -ldl

trunk/libtorrent/test/torrent/object_static_map_test.cc

@@ -4 +4 @@
 #include <torrent/object_stream.h>
 #include "torrent/object_static_map.h"
+#include "protocol/extensions.h"
 
 #import "object_test_utils.h"
@@ -150 +151 @@
 
    CPPUNIT_ASSERT(static_map_read_bencode(test_skip_map, test_read_skip_bencode));
+}
+
+template <>
+const torrent::ExtHandshakeMessage::key_list_type torrent::ExtHandshakeMessage::keys = {
+  { key_e,            "e" },
+  { key_m_utPex,      "m::ut_pex" },
+  { key_p,            "p" },
+  { key_reqq,         "reqq" },
+  { key_v,            "v" },
+};
+
+void
+ObjectStaticMapTest::test_read_extensions() {
+  torrent::ExtHandshakeMessage test_ext;
+
+  CPPUNIT_ASSERT(static_map_read_bencode(test_ext, "d1:ai1ee"));
+
+  CPPUNIT_ASSERT(static_map_read_bencode(test_ext, "d1:mi1ee"));
+  CPPUNIT_ASSERT(static_map_read_bencode(test_ext, "d1:mdee"));
+  CPPUNIT_ASSERT(static_map_read_bencode(test_ext, "d6:ut_pexi0ee"));
+  CPPUNIT_ASSERT(static_map_read_bencode(test_ext, "d1:md6:ut_pexi0eee"));
 }
 
@@ -176 +198 @@
 enum keys_raw_types { key_raw_types_empty, key_raw_types_list, key_raw_types_map, key_raw_types_str, key_raw_types_LAST};
 enum keys_multiple { key_multiple_a, key_multiple_b, key_multiple_c, key_multiple_LAST };
+enum keys_dict { key_dict_a_b, key_dict_LAST };
 
 typedef torrent::static_map_type<keys_empty, key_empty_LAST> test_empty_type;
@@ -182 +205 @@
 typedef torrent::static_map_type<keys_raw_types, key_raw_types_LAST> test_raw_types_type;
 typedef torrent::static_map_type<keys_multiple, key_multiple_LAST> test_multiple_type;
+typedef torrent::static_map_type<keys_dict, key_dict_LAST> test_dict_type;
 
 template <> const test_empty_type::key_list_type
@@ -196 +220 @@
 template <> const test_multiple_type::key_list_type
 test_multiple_type::keys = { { key_multiple_a, "a" }, { key_multiple_b, "b*" }, { key_multiple_c, "c" } };
+template <> const test_dict_type::key_list_type
+test_dict_type::keys = { { key_dict_a_b, "a::b" } };
 
 void
@@ -290 +316 @@
 
 void
+ObjectStaticMapTest::test_read_dict() {
+  test_dict_type map_normal;
+
+  CPPUNIT_ASSERT(static_map_read_bencode(map_normal, "d1:ai1ee"));
+  CPPUNIT_ASSERT(map_normal[key_dict_a_b].is_empty());
+
+  CPPUNIT_ASSERT(static_map_read_bencode(map_normal, "d1:adee"));
+  CPPUNIT_ASSERT(map_normal[key_dict_a_b].is_empty());
+
+  CPPUNIT_ASSERT(static_map_read_bencode(map_normal, "d1:ad1:bi1eee"));
+  CPPUNIT_ASSERT(map_normal[key_dict_a_b].as_value() == 1);
+}
+
+void
 ObjectStaticMapTest::test_write_empty() {
   test_empty_type map_normal;

trunk/libtorrent/test/torrent/object_static_map_test.h

@@ -8 +8 @@
   CPPUNIT_TEST(test_write);
   CPPUNIT_TEST(test_read);
+  CPPUNIT_TEST(test_read_extensions);
 
   CPPUNIT_TEST(test_read_empty);
@@ -14 +15 @@
   CPPUNIT_TEST(test_read_raw_types);
   CPPUNIT_TEST(test_read_multiple);
+  CPPUNIT_TEST(test_read_dict);
 
   CPPUNIT_TEST(test_write_empty);
@@ -29 +31 @@
   void test_read();
 
+  void test_read_extensions();
+
   // Proper unit tests:
   void test_read_empty();
@@ -35 +39 @@
   void test_read_raw_types();
   void test_read_multiple();
+  void test_read_dict();
 
   void test_write_empty();

trunk/libtorrent/test/torrent/object_stream_test.cc

@@ -125 +125 @@
   CPPUNIT_ASSERT(object_stream_read_skip("d1:ali1eee"));
   CPPUNIT_ASSERT(object_stream_read_skip("d1:ad1:bi1eee"));
+
+  CPPUNIT_ASSERT(object_stream_read_skip("d1:md6:ut_pexi0eee"));
 }