Author: jmolenda Date: Thu Oct 27 18:52:46 2016 New Revision: 285369 URL: http://llvm.org/viewvc/llvm-project?rev=285369&view=rev Log: Check that we got back an object from MakeFunctionCaller before we call through it.
<rdar://problem/28979705> Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp?rev=285369&r1=285368&r2=285369&view=diff ============================================================================== --- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp (original) +++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetItemInfoHandler.cpp Thu Oct 27 18:52:46 2016 @@ -188,7 +188,7 @@ lldb::addr_t AppleGetItemInfoHandler::Se get_item_info_caller = m_get_item_info_impl_code->MakeFunctionCaller( get_item_info_return_type, get_item_info_arglist, thread.shared_from_this(), error); - if (error.Fail()) { + if (error.Fail() || get_item_info_caller == nullptr) { if (log) log->Printf("Error Inserting get-item-info function: \"%s\".", error.AsCString()); Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp?rev=285369&r1=285368&r2=285369&view=diff ============================================================================== --- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp (original) +++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetPendingItemsHandler.cpp Thu Oct 27 18:52:46 2016 @@ -192,7 +192,7 @@ lldb::addr_t AppleGetPendingItemsHandler m_get_pending_items_impl_code->MakeFunctionCaller( get_pending_items_return_type, get_pending_items_arglist, thread_sp, error); - if (error.Fail()) { + if (error.Fail() || get_pending_items_caller == nullptr) { if (log) log->Printf("Failed to install pending-items introspection function " "caller: %s.", Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp?rev=285369&r1=285368&r2=285369&view=diff ============================================================================== --- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp (original) +++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetQueuesHandler.cpp Thu Oct 27 18:52:46 2016 @@ -205,7 +205,7 @@ AppleGetQueuesHandler::SetupGetQueuesFun Error error; get_queues_caller = m_get_queues_impl_code_up->MakeFunctionCaller( get_queues_return_type, get_queues_arglist, thread_sp, error); - if (error.Fail()) { + if (error.Fail() || get_queues_caller == nullptr) { if (log) log->Printf( "Could not get function caller for get-queues function: %s.", Modified: lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp?rev=285369&r1=285368&r2=285369&view=diff ============================================================================== --- lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp (original) +++ lldb/trunk/source/Plugins/SystemRuntime/MacOSX/AppleGetThreadItemInfoHandler.cpp Thu Oct 27 18:52:46 2016 @@ -203,7 +203,7 @@ lldb::addr_t AppleGetThreadItemInfoHandl m_get_thread_item_info_impl_code->MakeFunctionCaller( get_thread_item_info_return_type, get_thread_item_info_arglist, thread_sp, error); - if (error.Fail()) { + if (error.Fail() || get_thread_item_info_caller == nullptr) { if (log) log->Printf("Failed to install get-thread-item-info introspection " "caller: %s.", _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits