diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-28 13:58:00 +0200 |
| commit | 14caf5475b8963e6b6689e96a0a7a64e13bb1887 (patch) | |
| tree | 8d08ab19e287fca6a07622560669573fb9750181 /indra/llplugin | |
| parent | 33a417dd2d93573f7aafc194eefdad5339bccf1d (diff) | |
| parent | 52bd13e1f5cd661ff359e36be8c0496d06c19d1c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginprocesschild.cpp | 1 | ||||
| -rw-r--r-- | indra/llplugin/slplugin/slplugin.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 07fc82c770..11c924cadf 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -359,6 +359,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) else { LL_WARNS("Plugin") << "Couldn't create a shared memory segment!" << LL_ENDL; + delete region; } } diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp index 23dc532ba5..77240ce546 100644 --- a/indra/llplugin/slplugin/slplugin.cpp +++ b/indra/llplugin/slplugin/slplugin.cpp @@ -156,7 +156,7 @@ bool checkExceptionHandler() if (prev_filter == NULL) { ok = FALSE; - if (myWin32ExceptionHandler == NULL) + if (NULL == myWin32ExceptionHandler) { LL_WARNS("AppInit") << "Exception handler uninitialized." << LL_ENDL; } |