Changeset 1057 for trunk/rtorrent/src/rpc/xmlrpc.cc

Timestamp:

05/01/08 13:14:43 (4 years ago)

Author:

rakshasa

Message:

* Fixed EINTR handling in execute command. Patch by anonymous.

* Fixed a couple of memory leaks in xmlrpc.cc. Reported by Novik.

Files:

• trunk/rtorrent/src/rpc/xmlrpc.cc (modified) (2 diffs)

trunk/rtorrent/src/rpc/xmlrpc.cc

@@ -378 +378 @@
     xmlrpc_value* result = xmlrpc_array_new(env);
     
-    for (torrent::Object::list_const_iterator itr = object.as_list().begin(), last = object.as_list().end(); itr != last; itr++)
-      xmlrpc_array_append_item(env, result, object_to_xmlrpc(env, *itr));
+    for (torrent::Object::list_const_iterator itr = object.as_list().begin(), last = object.as_list().end(); itr != last; itr++) {
+      xmlrpc_value* item = object_to_xmlrpc(env, *itr);
+      xmlrpc_array_append_item(env, result, item);
+      xmlrpc_DECREF(item);
+    }
 
     return result;
@@ -388 +391 @@
     xmlrpc_value* result = xmlrpc_struct_new(env);
     
-    for (torrent::Object::map_const_iterator itr = object.as_map().begin(), last = object.as_map().end(); itr != last; itr++)
-      xmlrpc_struct_set_value(env, result, itr->first.c_str(), object_to_xmlrpc(env, itr->second));
+    for (torrent::Object::map_const_iterator itr = object.as_map().begin(), last = object.as_map().end(); itr != last; itr++) {
+      xmlrpc_value* item = object_to_xmlrpc(env, itr->second);
+      xmlrpc_struct_set_value(env, result, itr->first.c_str(), item);
+      xmlrpc_DECREF(item);
+    }
 
     return result;