fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-22 09:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if target is null in xmlrpc_to_object().

Browse Source
This commit is contained in:
rakshasa
2025-09-19 09:02:29 +02:00
committed by Jari Sundell
parent 658e9f7578
commit 675625255d
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/rpc_manager.cc
+3 -6
View File
@@ -18,21 +18,18 @@ RpcManager::object_to_target(const torrent::Object& obj, int call_flags, rpc::ta
if (call_flags & CommandMap::flag_no_target) if (call_flags & CommandMap::flag_no_target)
return; return;
if (!obj.is_string()) { if (!obj.is_string())
throw torrent::input_error("invalid parameters: target must be a string"); throw torrent::input_error("invalid parameters: target must be a string");
}
std::string target_string = obj.as_string(); std::string target_string = obj.as_string();
bool require_index = (call_flags & (CommandMap::flag_tracker_target | CommandMap::flag_file_target)); bool require_index = (call_flags & (CommandMap::flag_tracker_target | CommandMap::flag_file_target));
if (target_string.size() == 0 && !require_index) { if (target_string.size() == 0 && !require_index)
return; return;
}
// Length of SHA1 hash is 40 // Length of SHA1 hash is 40
if (target_string.size() < 40) { if (target_string.size() < 40)
throw torrent::input_error("invalid parameters: invalid target"); throw torrent::input_error("invalid parameters: invalid target");
}
char type = 'd'; char type = 'd';
std::string hash; std::string hash;
src/rpc/xmlrpc_c.cc
+1 -1
View File
@@ -219,7 +219,7 @@ xmlrpc_to_object(xmlrpc_env* env, xmlrpc_value* value, int call_type, rpc::targe
if (env->fault_occurred) if (env->fault_occurred)
throw xmlrpc_error_c(env); throw xmlrpc_error_c(env);
if (target->first == XmlRpc::call_download && if (target != nullptr && target->first == XmlRpc::call_download &&
(call_type == XmlRpc::call_file || call_type == XmlRpc::call_tracker)) { (call_type == XmlRpc::call_file || call_type == XmlRpc::call_tracker)) {
// If we have a download target and the call type requires // If we have a download target and the call type requires
// another contained type, then we try to use the next // another contained type, then we try to use the next