From: Scott Moynes <smoynes@nexus.carleton.ca>
Date: Sat, 20 Apr 2002 15:28:14 +0000 (+0000)
Subject: fixed memory leaks for strftime_format and rootcommand
X-Git-Tag: openbox-1_0_1^2~58
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0a3cfdfcb956024639a05549a50586e3d826b42e;p=dana%2Fopenbox.git

fixed memory leaks for strftime_format and rootcommand
---

diff --git a/src/Screen.cc b/src/Screen.cc
index 8ad57376..0548f5ac 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1192,9 +1192,13 @@ void BScreen::load() {
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "strftimeFormat" << ends;
   rclass << rscreen.str() << "StrftimeFormat" << ends;
+
+  if (resource.strftime_format != NULL){
+    delete [] resource.strftime_format;
+    resource.strftime_format=NULL;
+  }
+
   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
@@ -1233,9 +1237,12 @@ void BScreen::load() {
   rname.seekp(0); rclass.seekp(0);
   rname << rscreen.str() << "rootCommand" << ends;
   rclass << rscreen.str() << "RootCommand" << ends;
+
+  if (resource.root_command != NULL){
+    delete [] resource.root_command;
+    resource.root_command=NULL;
+  }
   if (config.getValue(rname.str(), rclass.str(), s)) {
-    if (resource.root_command != NULL)
-      delete [] resource.root_command;
     resource.root_command = bstrdup(s.c_str());
   }