Changeset 1057

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.

Location:

trunk/rtorrent/src/rpc

Files:

• exec_file.cc (modified) (2 diffs)
• parse.cc (modified) (1 diff)
• xmlrpc.cc (modified) (2 diffs)

trunk/rtorrent/src/rpc/exec_file.cc

@@ -39 +39 @@
 #include <string>
 #include <unistd.h>
+#include <rak/error_number.h>
 #include <rak/path.h>
 #include <sys/types.h>
@@ -91 +92 @@
   } else {
     int status;
+    int wpid = waitpid(childPid, &status, 0);
 
-    if (waitpid(childPid, &status, 0) != childPid)
+    while (wpid == -1 && rak::error_number::current().value() == rak::error_number::e_intr)
+      wpid = waitpid(childPid, &status, 0);
+
+    if (wpid != childPid)
       throw torrent::internal_error("ExecFile::execute(...) waitpid failed.");
 

trunk/rtorrent/src/rpc/parse.cc

@@ -374 +374 @@
 
   case torrent::Object::TYPE_VALUE:
-    return std::max(first + snprintf(first, std::distance(first, last), "%lli", src->as_value()), last);
+    return std::min(first + snprintf(first, std::distance(first, last), "%lli", src->as_value()), last);
 
   case torrent::Object::TYPE_LIST:

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;