Changeset 21827 for branches/gcc-kmk/src

Timestamp:

Nov 29, 2011, 12:18:51 PM (14 years ago)

Author:

dmik

Message:

Fix crash when reading non-existent ODIN.INI.

File:

• branches/gcc-kmk/src/kernel32/profile.cpp (modified) (2 diffs)

branches/gcc-kmk/src/kernel32/profile.cpp

@@ -219 +219 @@
     PROFILESECTION **next_section;
     PROFILEKEY *key, *prev_key, **next_key;
+
+    if (file == NULL)
+        return NULL;
 
     first_section = (PROFILESECTION *)HEAP_xalloc( SystemHeap, 0, sizeof(*section) );
@@ -1004 +1007 @@
     if ( (p = getenv( "ODIN_INI" )) && (f = fopen( p, "r" )) )
     {
-      PROFILE_OdinProfile = PROFILE_Load( f );
-      fclose( f );
-      strncpy(PROFILE_OdinIniUsed,p,MAX_PATHNAME_LEN);
-      PROFILE_OdinIniUsed[MAX_PATHNAME_LEN-1] = 0;
+        PROFILE_OdinProfile = PROFILE_Load( f );
+        fclose( f );
+        strncpy(PROFILE_OdinIniUsed,p,MAX_PATHNAME_LEN);
+        PROFILE_OdinIniUsed[MAX_PATHNAME_LEN-1] = 0;
     }
     else
     {
-      #if 0 /* Aug 27 2000 4:26am: Why not use the global kernel32Path
-             *                (LoadLibrary may cause harm if used...) */
-      HINSTANCE hInstance = LoadLibraryA("KERNEL32.DLL");
-      GetModuleFileNameA(hInstance,PROFILE_OdinIniUsed,sizeof(PROFILE_OdinIniUsed));
-      FreeLibrary(hInstance);
-      strcpy(strrchr(PROFILE_OdinIniUsed,'\\')+1,ODINININAME);
-      #else
-      strcpy(PROFILE_OdinIniUsed, kernel32Path);
-      strcat(PROFILE_OdinIniUsed, ODINININAME);
-      #endif
-      f = fopen(PROFILE_OdinIniUsed, "r");
-      PROFILE_OdinProfile = PROFILE_Load(f);
-      fclose(f);
+        strcpy(PROFILE_OdinIniUsed, kernel32Path);
+        strcat(PROFILE_OdinIniUsed, ODINININAME);
+        if ((f = fopen(PROFILE_OdinIniUsed, "r")))
+        {
+            PROFILE_OdinProfile = PROFILE_Load(f);
+            fclose(f);
+        }
     }