Changeset 1093

Timestamp:

05/16/09 08:59:54 (3 years ago)

Author:

rakshasa

Message:

* Fix crashes/errors due to rtorrent attempting to pass non-utf-8 strings to xmlrpc. Patch by Josef Drexler.

* Disabled strict ordering check for the bencode decoder added 2 revisions ago, as it might be messing up PEX, etc.

Location:

trunk

Files:

• libtorrent/src/torrent/object_stream.cc (modified) (4 diffs)
• rtorrent/src/rpc/xmlrpc.cc (modified) (1 diff)

trunk/libtorrent/src/torrent/object_stream.cc

@@ -108 +108 @@
       break;
 
-    Object::string_type last;
+    //    Object::string_type last;
 
     while (input->good()) {
@@ -121 +121 @@
         break;
 
-      if (last >= str)
-        break;
+      //      if (last >= str)
+      //        break;
 
       object_read_bencode(input, &object->as_map()[str], depth);
 
-      str.swap(last);
+      //      str.swap(last);
     }
 
@@ -203 +203 @@
       output->buffer = output->writeFunc(output->data, output->buffer);
       output->pos = output->buffer.first;
+
+      //      if (output->buffer.first == output->buffer.second)
+      //        return;
     }
 
@@ -298 +301 @@
   object_write_bencode_c_object(&output, object);
 
+  //  if (output->buffer.first == output->buffer.second)
+  //    throw 
+
   // Don't flush the buffer.
   if (output.pos == output.buffer.first)

trunk/rtorrent/src/rpc/xmlrpc.cc

@@ -372 +372 @@
 
   case torrent::Object::TYPE_STRING:
-    return xmlrpc_string_new(env, object.as_string().c_str());
+  {
+#ifdef XMLRPC_HAVE_I8
+    // The versions that support I8 do implicit utf-8 validation.
+    xmlrpc_value* result = xmlrpc_string_new(env, object.as_string().c_str());
+#else
+    // In older versions, xmlrpc-c doesn't validate the utf-8 encoding itself.
+    xmlrpc_validate_utf8(env, object.as_string().c_str(), object.as_string().length());
+
+    xmlrpc_value* result = env->fault_occurred ? NULL : xmlrpc_string_new(env, object.as_string().c_str());
+#endif
+
+    if (env->fault_occurred) {
+      xmlrpc_env_clean(env);
+      xmlrpc_env_init(env);
+
+      const std::string& str = object.as_string();
+      char buffer[str.size() + 1];
+      char* dst = buffer;
+      for (std::string::const_iterator itr = str.begin(); itr != str.end(); ++itr)
+        *dst++ = ((*itr < 0x20 && *itr != '\r' && *itr != '\n' && *itr != '\t') || (*itr & 0x80)) ? '?' : *itr;
+      *dst = 0;
+
+      result = xmlrpc_string_new(env, buffer);
+    }
+
+    return result;
+  }
 
   case torrent::Object::TYPE_LIST: