Changeset 155 for trunk/src/helpers/prfh.c

Timestamp:

Apr 17, 2002, 10:11:38 PM (23 years ago)

Author:

umoeller

Message:

Patches from Martin and Paul, plus regexp support.

File:

• trunk/src/helpers/prfh.c (modified) (2 diffs)

trunk/src/helpers/prfh.c

@@ -89 +89 @@
  *
  *@@changed V0.9.12 (2001-05-12) [umoeller]: changed prototypes to return APIRET now
+ *@@changed V0.9.19 (2002-04-11) [pr]: Fixed app. with no keys
  */
 
@@ -100 +101 @@
 
     // get size of keys list for pszApp
-    if (    (!PrfQueryProfileSize(hIni, (PSZ)pcszApp, NULL, &ulSizeOfKeysList))
-         || (ulSizeOfKeysList == 0)
-       )
+    if (!PrfQueryProfileSize(hIni, (PSZ)pcszApp, NULL, &ulSizeOfKeysList))
         arc = PRFERR_KEYSLIST;
     else
     {
-        pKeys = (PSZ)malloc(ulSizeOfKeysList);
-        if (!pKeys)
+        if (ulSizeOfKeysList == 0)
+            ulSizeOfKeysList = 1;    // V0.9.19 (2002-04-11) [pr]
+
+        if (!(pKeys = (PSZ)malloc(ulSizeOfKeysList)))
             arc = ERROR_NOT_ENOUGH_MEMORY;
         else
+        {
+            *pKeys = 0;
             if (!PrfQueryProfileData(hIni, (PSZ)pcszApp, NULL, pKeys, &ulSizeOfKeysList))
                 arc = PRFERR_KEYSLIST;
+        }
     }