From: Dana Jansens <danakj@orodu.net>
Date: Fri, 19 Apr 2002 21:05:49 +0000 (+0000)
Subject: fixed memory leak in screen::load()
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=8f8eba7b962023a7cd702f503c1d9e4645d984fb;p=chaz%2Fopenbox

fixed memory leak in screen::load()
---

diff --git a/src/Screen.cc b/src/Screen.cc
index 44515671..8ad57376 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1192,8 +1192,11 @@ void BScreen::load() {
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "strftimeFormat" << ends;
   rclass << rscreen.str() << "StrftimeFormat" << ends;
-  if (config.getValue(rname.str(), rclass.str(), s))
+  if (config.getValue(rname.str(), rclass.str(), s)) {
+    if (resource.strftime_format != NULL)
+      delete [] resource.strftime_format;
     resource.strftime_format = bstrdup(s.c_str());
+  }
 #else // !HAVE_STRFTIME
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "dateFormat" << ends;
@@ -1230,8 +1233,11 @@ void BScreen::load() {
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "rootCommand" << ends;
   rclass << rscreen.str() << "RootCommand" << ends;
-  if (config.getValue(rname.str(), rclass.str(), s))
+  if (config.getValue(rname.str(), rclass.str(), s)) {
+    if (resource.root_command != NULL)
+      delete [] resource.root_command;
     resource.root_command = bstrdup(s.c_str());
+  }
 
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "opaqueMove" << ends;