Changeset 725

Timestamp:

Jul 6, 2007, 12:15:59 AM (18 years ago)

Author:

Steven Levine

Message:

GetFileEAs: avoid heap corruption

File:

• trunk/dll/eas.c (modified) (17 diffs)

trunk/dll/eas.c

@@ -15 +15 @@
   17 Jul 06 SHL Use Runtime_Error
   22 Mar 07 GKY Use QWL_USER
+  05 Jul 07 SHL GetFileEAs: avoid heap corruption
 
 ***********************************************************************/
@@ -171 +172 @@
 
             ealen = sizeof(FEA2LIST) + strlen(s) + 64;
-            rc = DosAllocMem((PPVOID) & pfealist, ealen + 1L,
+            rc = DosAllocMem((PPVOID) & pfealist, ealen + 1,
                              OBJ_TILE | PAG_COMMIT | PAG_READ | PAG_WRITE);
             if (rc)
@@ -179 +180 @@
               memset(pfealist, 0, ealen + 1);
               pfealist->cbList = ealen;
-              pfealist->list[0].oNextEntryOffset = 0L;
+              pfealist->list[0].oNextEntryOffset = 0;
               pfealist->list[0].fEA = 0;
               pfealist->list[0].cbName = strlen(s);
@@ -202 +203 @@
               eaop.fpGEA2List = (PGEA2LIST) 0;
               eaop.fpFEA2List = pfealist;
-              eaop.oError = 0L;
+              eaop.oError = 0;
               DosSetPathInfo(filename, FIL_QUERYEASIZE, (PVOID) & eaop,
                              (ULONG) sizeof(EAOP2), DSPI_WRTTHRU);
@@ -483 +484 @@
                 const CHAR *linefeed = "\n";
                 BOOL alltext;
-                IPT pos = 0L;
+                IPT pos = 0;
 
                 info = eap->head;
@@ -902 +903 @@
           eaop.fpGEA2List = &gealist;
           eaop.fpFEA2List = pfealist;
-          eaop.oError = 0L;
+          eaop.oError = 0;
           rc = DosSetPathInfo(eap->filename, FIL_QUERYEASIZE, (PVOID) & eaop,
                               (ULONG) sizeof(EAOP2), DSPI_WRTTHRU);
@@ -1005 +1006 @@
     return (PVOID) pfealist;
   len = strlen(newdata);
-  ealen = sizeof(FEA2LIST) + 24L + (ULONG) current->cbName + 1L +
-    (ULONG) len + 4L;
+  ealen = sizeof(FEA2LIST) + 24 + (ULONG) current->cbName + 1 +
+         (ULONG)len + 4;
   switch (*(USHORT *) current->value) {
   case EAT_EA:
@@ -1044 +1045 @@
   else {
     memset(pfealist, 0, ealen);
-    pfealist->list[0].oNextEntryOffset = 0L;
+    pfealist->list[0].oNextEntryOffset = 0;
     pfealist->list[0].fEA = 0;          //current->fEA;
 
@@ -1145 +1146 @@
     eaop.fpGEA2List = (PGEA2LIST) 0;
     eaop.fpFEA2List = pfealist;
-    eaop.oError = 0L;
-    pfealist->cbList = 13L + (ULONG) pfealist->list[0].cbName +
-      (ULONG) pfealist->list[0].cbValue;
+    eaop.oError = 0;
+    pfealist->cbList = 13 + (ULONG) pfealist->list[0].cbName +
+                       (ULONG)pfealist->list[0].cbValue;
 
     rc = DosSetPathInfo(filename, FIL_QUERYEASIZE, (PVOID) & eaop,
@@ -1188 +1189 @@
   if (!filename)
     return head;
-  if (ishandle || !DosOpen(filename, &handle, &action, 0L, 0,
+  if (ishandle || !DosOpen(filename, &handle, &action, 0, 0,
                            OPEN_ACTION_FAIL_IF_NEW |
                            OPEN_ACTION_OPEN_IF_EXISTS,
                            OPEN_FLAGS_NOINHERIT |
                            OPEN_SHARE_DENYREADWRITE |
-                           OPEN_ACCESS_READWRITE, (PEAOP2) 0)) {
+                           OPEN_ACCESS_READWRITE, (PEAOP2)0)) {
     if (ishandle)
       handle = *(HFILE *) filename;
-    if (!DosQueryFileInfo(handle, FIL_QUERYEASIZE, (PVOID) & fsa4,
-                          (ULONG) sizeof(fsa4)) && fsa4.cbList > 4L) {
-
+    if (!DosQueryFileInfo(handle, FIL_QUERYEASIZE, (PVOID)&fsa4,
+                          (ULONG) sizeof(fsa4)) &&
+        fsa4.cbList > 4)
+    {
       PDENA2 pdena;
       EAOP2 eaop;
@@ -1204 +1206 @@
       PFEA2LIST pfealist;
       PGEA2 pgea;
-      ULONG x = 1L, ecnt = 1L;
+      ULONG ulEntry = 1;                // Ordinal of EA to return
+      ULONG ulCount = 1;                // # of EAs to return
 
       pdena = xmalloc(65536 + 1024, pszSrcFile, __LINE__);
       if (pdena) {
-        while (!DosEnumAttribute
-               (ENUMEA_REFTYPE_FHANDLE, &handle, x, (PVOID) pdena,
-                (ULONG) 65536L, &ecnt, ENUMEA_LEVEL_NO_VALUE) && ecnt) {
+        while (!DosEnumAttribute(ENUMEA_REFTYPE_FHANDLE,
+                                 &handle,
+                                 ulEntry,
+                                 (PVOID)pdena,
+                                 (ULONG)65536L,
+                                 &ulCount,
+                                 ENUMEA_LEVEL_NO_VALUE) &&
+               ulCount)
+        {
+          // 64 is for header and spare - fixme to allocate smarter
           pgealist = xmalloc(64 + pdena->cbName, pszSrcFile, __LINE__);
           if (pgealist) {
             pgealist->cbList = 64 + pdena->cbName;
             pgea = pgealist->list;
-            pgea->oNextEntryOffset = 0L;
+            pgea->oNextEntryOffset = 0;
             pgea->cbName = pdena->cbName;
             memcpy(pgea->szName, pdena->szName, pdena->cbName + 1);
-            pfealist =
-              xmallocz(64 + pdena->cbName + pdena->cbValue, pszSrcFile,
-                       __LINE__);
+            pfealist = xmallocz(64 + pdena->cbName + pdena->cbValue,
+                                pszSrcFile, __LINE__);
             if (pfealist) {
               pfealist->cbList = 64 + pdena->cbName + pdena->cbValue;
               eaop.fpGEA2List = pgealist;
               eaop.fpFEA2List = pfealist;
-              eaop.oError = 0L;
-              // saymsg(MB_ENTER,HWND_DESKTOP,"Debug1","\"%s\" %ld",pdena->szName,x);
+              eaop.oError = 0;
+              // saymsg(MB_ENTER,HWND_DESKTOP,"Debug1","\"%s\" %ld",pdena->szName,ulEntry);
               rc =
                 DosQueryFileInfo(handle, FIL_QUERYEASFROMLIST, (PVOID) & eaop,
@@ -1243 +1252 @@
                 info = xmalloc(sizeof(HOLDFEA), pszSrcFile, __LINE__);
                 if (info) {
-                  info->pfea =
-                    xmalloc(eaop.fpFEA2List->cbList - sizeof(ULONG),
-                            pszSrcFile, __LINE__);
+                  // 05 Jul 07 SHL was one short
+                  info->pfea = xmalloc(eaop.fpFEA2List->cbList - sizeof(ULONG) + 1,
+                                       pszSrcFile, __LINE__);
                   memcpy(info->pfea, eaop.fpFEA2List->list,
                          eaop.fpFEA2List->cbList - sizeof(ULONG));
@@ -1265 +1274 @@
             free(pgealist);
           }
-          x += ecnt;
-        }
+          ulEntry += ulCount;
+        } // while
         free(pdena);
         DosPostEventSem(CompactSem);
@@ -1275 +1284 @@
   }
   else {
+    Runtime_Error(pszSrcFile, __LINE__, "why here", filename);
     /* try it without opening it */
     if (!DosQueryPathInfo(filename, FIL_QUERYEASIZE, (PVOID) & fsa4,
-                          (ULONG) sizeof(fsa4)) && fsa4.cbList > 4L) {
-
+                          (ULONG) sizeof(fsa4)) &&
+        fsa4.cbList > 4)
+    {
       PDENA2 pdena;
       EAOP2 eaop;
@@ -1284 +1295 @@
       PFEA2LIST pfealist;
       PGEA2 pgea;
-      ULONG x = 1L, ecnt = 1L;
+      ULONG ulEntry = 1, ulCount = 1;
 
       pdena = xmalloc(65536 + 1024, pszSrcFile, __LINE__);
       if (pdena) {
         while (!DosEnumAttribute
-               (ENUMEA_REFTYPE_PATH, filename, x, (PVOID) pdena,
-                (ULONG) 65536L, &ecnt, ENUMEA_LEVEL_NO_VALUE) && ecnt) {
+               (ENUMEA_REFTYPE_PATH, filename, ulEntry, (PVOID) pdena,
+                (ULONG) 65536L, &ulCount, ENUMEA_LEVEL_NO_VALUE) && ulCount)
+        {
           pgealist = xmalloc(64 + pdena->cbName, pszSrcFile, __LINE__);
           if (pgealist) {
             pgealist->cbList = 64 + pdena->cbName;
             pgea = pgealist->list;
-            pgea->oNextEntryOffset = 0L;
+            pgea->oNextEntryOffset = 0;
             pgea->cbName = pdena->cbName;
             memcpy(pgea->szName, pdena->szName, pdena->cbName + 1);
@@ -1305 +1317 @@
               eaop.fpGEA2List = pgealist;
               eaop.fpFEA2List = pfealist;
-              eaop.oError = 0L;
-// saymsg(MB_ENTER,HWND_DESKTOP,"Debug2","\"%s\" %ld",pdena->szName,x);
+              eaop.oError = 0;
+              // saymsg(MB_ENTER,HWND_DESKTOP,"Debug2","\"%s\" %ld",pdena->szName,ulEntry);
               rc = DosQueryPathInfo(filename, FIL_QUERYEASFROMLIST,
                                     (PVOID) & eaop, (ULONG) sizeof(EAOP2));
@@ -1360 +1372 @@
             free(pgealist);
           }
-          x += ecnt;
-        }
+          ulEntry += ulCount;
+        } // while
         free(pdena);
         DosPostEventSem(CompactSem);