commit abdbced4fdb72666507f88389621176a11cc0a7d
author Dimitrie O. Paun <dimi@cs.toronto.edu> Sat Apr 29 14:20:28 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Apr 29 14:20:28 2000 +0000
tree 042afb0b2d3339bf1809545bafeae2c29a861f5e
parent d34abdd15830e6e6da43fddc46aa75fb52574c2c

Removed some HEAP_xalloc calls.

files/profile.c

diff --git a/files/profile.c b/files/profile.c
index f4fa3bb..7644413 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -202,7 +202,8 @@
     PROFILESECTION **next_section;
     PROFILEKEY *key, *prev_key, **next_key;
 
-    first_section = HEAP_xalloc( GetProcessHeap(), 0, sizeof(*section) );
+    first_section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) );
+    if(first_section == NULL) return NULL; 
     first_section->name = NULL;
     first_section->key  = NULL;
     first_section->next = NULL;
@@ -226,7 +227,8 @@
             {
                 *p2 = '\0';
                 p++;
-                section = HEAP_xalloc( GetProcessHeap(), 0, sizeof(*section) );
+                section = HeapAlloc( GetProcessHeap(), 0, sizeof(*section) );
+		if(section == NULL) break;
                 section->name = HEAP_strdupA( GetProcessHeap(), 0, p );
                 section->key  = NULL;
                 section->next = NULL;
@@ -253,8 +255,9 @@
         }
 
         if(*p || !prev_key || *prev_key->name)
-          {
-           key = HEAP_xalloc( GetProcessHeap(), 0, sizeof(*key) );
+        {
+           key = HeapAlloc( GetProcessHeap(), 0, sizeof(*key) );
+	   if(key == NULL) break;
            key->name  = HEAP_strdupA( GetProcessHeap(), 0, p );
            key->value = p2 ? HEAP_strdupA( GetProcessHeap(), 0, p2 ) : NULL;
            key->next  = NULL;
@@ -263,7 +266,7 @@
            prev_key   = key;
 
            TRACE("New key: name='%s', value='%s'\n",key->name,key->value?key->value:"(none)");
-          }
+        }
     }
     return first_section;
 }
@@ -426,7 +429,8 @@
                 key = &(*key)->next;
             }
             if (!create) return NULL;
-            *key = HEAP_xalloc( GetProcessHeap(), 0, sizeof(PROFILEKEY) );
+            *key = HeapAlloc( GetProcessHeap(), 0, sizeof(PROFILEKEY) );
+	    if(*key == NULL) return NULL;
             (*key)->name  = HEAP_strdupA( GetProcessHeap(), 0, key_name );
             (*key)->value = NULL;
             (*key)->next  = NULL;
@@ -435,10 +439,16 @@
         section = &(*section)->next;
     }
     if (!create) return NULL;
-    *section = HEAP_xalloc( GetProcessHeap(), 0, sizeof(PROFILESECTION) );
+    *section = HeapAlloc( GetProcessHeap(), 0, sizeof(PROFILESECTION) );
+    if(*section == NULL) return NULL;
     (*section)->name = HEAP_strdupA( GetProcessHeap(), 0, section_name );
     (*section)->next = NULL;
-    (*section)->key  = HEAP_xalloc( GetProcessHeap(), 0, sizeof(PROFILEKEY) );
+    (*section)->key  = HeapAlloc( GetProcessHeap(), 0, sizeof(PROFILEKEY) );
+    if((*section)->key  == NULL)
+    {
+	    HeapFree(GetProcessHeap(), 0, *section);
+	    return NULL;
+    }
     (*section)->key->name  = HEAP_strdupA( GetProcessHeap(), 0, key_name );
     (*section)->key->value = NULL;
     (*section)->key->next  = NULL;
@@ -535,7 +545,8 @@
     if(!CurProfile)
        for(i=0;i<N_CACHED_PROFILES;i++)
          {
-          MRUProfile[i]=HEAP_xalloc( GetProcessHeap(), 0, sizeof(PROFILE) );
+          MRUProfile[i]=HeapAlloc( GetProcessHeap(), 0, sizeof(PROFILE) );
+	  if(MRUProfile[i] == NULL) break;
           MRUProfile[i]->changed=FALSE;
           MRUProfile[i]->section=NULL;
           MRUProfile[i]->dos_name=NULL;