aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2020-08-02 00:21:20 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2020-08-02 00:23:13 +0000
commit03254742e55f44b70e6c13f4bf380b0ddb3d0133 (patch)
tree3b1c23fbb6a0f7d339729dca407c51c64e9f3bb8
parentMerge pull request #6729 (diff)
downloadmonero-03254742e55f44b70e6c13f4bf380b0ddb3d0133.tar.xz
epee: further defending against exceptions in command handlers
-rw-r--r--contrib/epee/include/storages/levin_abstract_invoke2.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/epee/include/storages/levin_abstract_invoke2.h b/contrib/epee/include/storages/levin_abstract_invoke2.h
index de8107781..e9625f0ce 100644
--- a/contrib/epee/include/storages/levin_abstract_invoke2.h
+++ b/contrib/epee/include/storages/levin_abstract_invoke2.h
@@ -290,6 +290,7 @@ namespace epee
#define BEGIN_INVOKE_MAP2(owner_type) \
template <class t_context> int handle_invoke_map(bool is_notify, int command, const epee::span<const uint8_t> in_buff, std::string& buff_out, t_context& context, bool& handled) \
{ \
+ try { \
typedef owner_type internal_owner_type_name;
#define HANDLE_INVOKE2(command_id, func, type_name_in, typename_out) \
@@ -335,7 +336,13 @@ namespace epee
LOG_ERROR("Unknown command:" << command); \
on_levin_traffic(context, false, false, true, in_buff.size(), "invalid-command"); \
return LEVIN_ERROR_CONNECTION_HANDLER_NOT_DEFINED; \
+ } \
+ catch (const std::exception &e) { \
+ MERROR("Error in handle_invoke_map: " << e.what()); \
+ return LEVIN_ERROR_CONNECTION_TIMEDOUT; /* seems kinda appropriate */ \
+ } \
}
+
}
}