- Don't let the CORBA implementation free() tempDirectoryPath

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8031 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 26, 2011 · 4326056 · 4326056
1 parent 9cd8362
commit 4326056
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/Compiler/runtime/Settings_omc.cpp b/Compiler/runtime/Settings_omc.cpp
@@ -76,7 +76,7 @@ extern const char* Settings_getVersionNr()
 
 extern const char* Settings_getTempDirectoryPath()
 {
-  return strdup(SettingsImpl__getTempDirectoryPath());
+  return SettingsImpl__getTempDirectoryPath();
 }
 
 }
diff --git a/Compiler/runtime/Settings_rml.c b/Compiler/runtime/Settings_rml.c
@@ -96,9 +96,9 @@ RML_END_LABEL
 
 RML_BEGIN_LABEL(Settings__getTempDirectoryPath)
 {
-  SettingsImpl__getTempDirectoryPath();
-  if (tempDirectoryPath)
-    rmlA0 = (void*) mk_scon(strdup(tempDirectoryPath));
+  const char *tdp = SettingsImpl__getTempDirectoryPath();
+  if (tdp)
+    rmlA0 = (void*) mk_scon(tdp);
   else
     rmlA0 = (void*) mk_scon("");
   RML_TAILCALLK(rmlSC);
@@ -164,15 +164,15 @@ RML_END_LABEL
 
 RML_BEGIN_LABEL(Settings__dumpSettings)
 {
+  const char *str;
   if(compileCommand)
     printf("compile command: %s\n",compileCommand);
 
   if(compilePath)
     printf("Compiler path: %s\n",compilePath);
 
-
-  if(tempDirectoryPath)
-    printf("temp directory path: %s\n",tempDirectoryPath);
+  if(0 != (str = SettingsImpl__getTempDirectoryPath()))
+    printf("temp directory path: %s\n",str);
 
   RML_TAILCALLK(rmlSC);
 }

diff --git a/Compiler/runtime/corbaimpl.cpp b/Compiler/runtime/corbaimpl.cpp
@@ -311,7 +311,7 @@ int CorbaImpl__initialize()
   mgr = poa->the_POAManager();
 
   /* get temp dir */
-  char* tmpDir = SettingsImpl__getTempDirectoryPath();
+  const char* tmpDir = SettingsImpl__getTempDirectoryPath();
   /* get the user name */
   char *user = getenv("USER");
   if (user==NULL) { user="nobody"; }
@@ -347,7 +347,6 @@ int CorbaImpl__initialize()
       ref = poa->id_to_reference (oid.in());
       objref_file << tmpDir << "/openmodelica." << user << ".objid";    
   }
-  free(tmpDir);
 
   str = orb->object_to_string (ref.in());
   /* Write reference to file */

diff --git a/Compiler/runtime/settingsimpl.c b/Compiler/runtime/settingsimpl.c
@@ -163,7 +163,7 @@ extern void SettingsImpl__setTempDirectoryPath(const char *path)
   tempDirectoryPath = strdup(path);
 }
 
-extern char* SettingsImpl__getTempDirectoryPath()
+extern const char* SettingsImpl__getTempDirectoryPath()
 {
   if (tempDirectoryPath == NULL) {
   // On windows, set Temp directory path to Temp directory as returned by GetTempPath,
@@ -186,7 +186,7 @@ extern char* SettingsImpl__getTempDirectoryPath()
   #else
     const char* str = getenv("TMPDIR");
     if (str == NULL)
-      str = "/tmp";
+      str = strdup("/tmp");
     tempDirectoryPath = strdup(str);
   #endif
   }

diff --git a/Compiler/runtime/settingsimpl.h b/Compiler/runtime/settingsimpl.h
@@ -30,5 +30,5 @@
 
 #ifndef SETTINGSIMPL__H_
 #define SETTINGSIMPL__H_
-extern char* SettingsImpl__getTempDirectoryPath();
+extern const char* SettingsImpl__getTempDirectoryPath();
 #endif