Changeset 1141 for trunk/libtorrent/src/torrent/object_stream.cc

Timestamp:

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

Author:

rakshasa

Message:

* Fixed a bug in reading bencoded data. #2112

Files:

• trunk/libtorrent/src/torrent/object_stream.cc (modified) (11 diffs)

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);
         }