From 8cafb5588147a23f54e34885f6cadda475e36d33 Mon Sep 17 00:00:00 2001 From: Jari Sundell Date: Thu, 25 Nov 2021 02:12:52 +0900 Subject: [PATCH 1/2] Updated ADA address. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 982957531..f8070f522 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Donate to rTorrent development * Bitcoin: 1MpmXm5AHtdBoDaLZstJw8nupJJaeKu8V8 * Etherium: 0x9AB1e3C3d8a875e870f161b3e9287Db0E6DAfF78 * Litecoin: LdyaVR67LBnTf6mAT4QJnjSG2Zk67qxmfQ - * Cardano: addr1q97wzvm8q4kc7dtmg782me2gkmmk3fewhsndt3le784wzdwa8kgkw4maafuxkv84q5pfcexakv9mpvr7hgj4kr53jy3q4n055m + * Cardano: addr1qytaslmqmk6dspltw06sp0zf83dh09u79j49ceh5y26zdcccgq4ph7nmx6kgmzeldauj43254ey97f3x4xw49d86aguqwfhlte Help keep rTorrent development going by donating to its creator. From 4abaa260ce758accc1866d1b0f744dc370ba3254 Mon Sep 17 00:00:00 2001 From: stickz Date: Sat, 27 Nov 2021 23:00:20 -0500 Subject: [PATCH 2/2] Fix common rtorrent xml-rpc crash when trying to queue an invalid task Instead of throwing an internal error and terminating the client, it's better not to queue the invalid task in the first place. `C Caught internal_error: 'priority_queue_insert(...) called on an invalid item.'.` --- src/rpc/command_scheduler_item.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpc/command_scheduler_item.cc b/src/rpc/command_scheduler_item.cc index 42a6ef434..af04a8840 100644 --- a/src/rpc/command_scheduler_item.cc +++ b/src/rpc/command_scheduler_item.cc @@ -53,10 +53,14 @@ CommandSchedulerItem::enable(rak::timer t) { if (is_queued()) disable(); + + // Don't schedule invalid tasks for rpc commands + if (!m_task.is_valid()) + return; // If 'first' is zero then we execute the task // immediately. ''interval()'' will not return zero so we never end - // up in an infinit loop. + // up in an infinite loop. m_timeScheduled = t; priority_queue_insert(&taskScheduler, &m_task, t); }