diff options
| author | AGaliuzov <AGaliuzov@luxoft.com> | 2016-04-19 14:34:10 +0300 |
|---|---|---|
| committer | AGaliuzov <AGaliuzov@luxoft.com> | 2016-04-19 14:34:10 +0300 |
| commit | dd1bb4b463894c2d78dedbd16b13dabbe41559e9 (patch) | |
| tree | ac6587d4624f670aaeb5f3bbe9c3b7c70c3d89f9 | |
| parent | e4cd770730b59c2b41572e3bc7f0510394a161d3 (diff) | |
| parent | d779f7c707018b516d7c68eb4aa2a68fff374f12 (diff) | |
| download | sdl_core-dd1bb4b463894c2d78dedbd16b13dabbe41559e9.tar.gz | |
Merge pull request #490 from okoreniak/hotfix/Core_dump_caused_double_free_on_app_exit
SDL doesn't crash with Core dump caused by double free on app exit
| -rw-r--r-- | src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp | 2 | ||||
| -rw-r--r-- | src/components/utils/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp b/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp index 1e63f0ba31..fb24d08f1c 100644 --- a/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp +++ b/src/3rd_party-static/MessageBroker/src/lib_messagebroker/CMessageBrokerRegistry.cpp @@ -77,7 +77,7 @@ namespace NsMessageBroker std::map <std::string, int>::iterator it = mControllersList.begin(); for (; it != mControllersList.end();) { if (it->second == fd) { - mControllersList.erase(it); + mControllersList.erase(it++); } else { ++it; } diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt index 3ebabe9043..af5afa028a 100644 --- a/src/components/utils/CMakeLists.txt +++ b/src/components/utils/CMakeLists.txt @@ -80,7 +80,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "QNX") ) endif() -add_library("Utils" SHARED ${SOURCES}) +add_library("Utils" ${SOURCES}) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") list(APPEND LIBRARIES dl) |