From f5928305fe494100bb7d0177823f8b4518359443 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Tue, 13 Mar 2018 19:34:36 +0200 Subject: [PATCH 1/3] Fixed: unused variable memory leak --HG-- branch : develop --- code/nel/src/3d/driver/opengl/unix_event_emitter.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp index 898c9f001..a43a251a9 100644 --- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp +++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp @@ -83,8 +83,6 @@ void CUnixEventEmitter::createIM() { #ifdef X_HAVE_UTF8_STRING - XModifierKeymap *g_mod_map = XGetModifierMapping(_dpy); - _im = XOpenIM(_dpy, NULL, NULL, NULL); if (_im == NULL) From ccb2cbfa78c63e9b98296688db180914f3259366 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Tue, 13 Mar 2018 20:41:46 +0200 Subject: [PATCH 2/3] Fixed: cURL multi/easy handle cleanup --HG-- branch : develop --- code/nel/src/gui/group_html.cpp | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index 7853ada77..7b2621b18 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/code/nel/src/gui/group_html.cpp @@ -698,6 +698,8 @@ namespace NLGUI } requestTerminated(); } + + continue; } for (vector::iterator it=Curls.begin(); itRequest); + + // release CCurlWWWData + delete Curls[i].data; + } + } + Curls.clear(); } class CGroupListAdaptor : public CInterfaceGroup @@ -3059,8 +3073,13 @@ namespace NLGUI // this is why the call to 'updateRefreshButton' has been removed from stopBrowse clearContext(); + releaseDownloads(); + if (_CurlWWW) delete _CurlWWW; + + if(MultiCurl) + curl_multi_cleanup(MultiCurl); } std::string CGroupHTML::getProperty( const std::string &name ) const From 23fa3d746057c3e97b727334797dfa2265578ccc Mon Sep 17 00:00:00 2001 From: Nimetu Date: Tue, 13 Mar 2018 20:41:49 +0200 Subject: [PATCH 3/3] Fixed: Possible crash from null pointer --HG-- branch : develop --- code/ryzom/client/src/light_cycle_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ryzom/client/src/light_cycle_manager.cpp b/code/ryzom/client/src/light_cycle_manager.cpp index 5ef2f52fb..eeeeb66f6 100644 --- a/code/ryzom/client/src/light_cycle_manager.cpp +++ b/code/ryzom/client/src/light_cycle_manager.cpp @@ -346,7 +346,7 @@ void CLightCycleManager::setHour(float hour, const CWeatherManagerClient &wm, NL // Set the Sun color only if not indoor - if (ContinentMngr.cur()->Indoor) + if (ContinentMngr.cur() && ContinentMngr.cur()->Indoor) { Scene->setSunAmbient(CRGBA(150, 150, 150, 255)); }