Changeset 1078 for trunk/dll/filldir.c

Timestamp:

Jul 19, 2008, 6:08:02 AM (17 years ago)

Author:

Steven Levine

Message:

More Fortify infrastructure enhancements
Rework Fortify_SetOwner
Add Fortify_BecomeOwner
Avoid more spurious leak reports

File:

• trunk/dll/filldir.c (modified) (4 diffs)

trunk/dll/filldir.c

@@ -63 +63 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "misc.h"                       // GetTidForWindow
+#include "fortify.h"                    // 06 May 08 SHL
 #include "fm3dll.h"
-
-#include "fortify.h"                    // 06 May 08 SHL
 
 static PSZ pszSrcFile = __FILE__;
@@ -262 +262 @@
       c2++;
     pci->pszFileName = xmalloc(c + c2, pszSrcFile, __LINE__);
+#   ifdef FORTIFY
+    {
+      unsigned tid = GetTidForWindow(hwndCnr);
+      // char buf[256];
+      if (tid == 1)
+        Fortify_ChangeScope(pci->pszFileName, -1);
+      else
+        Fortify_SetOwner(pci->pszFileName, 1);
+      // sprintf(buf, "Owner forced to %u", GetTidForWindow(hwndCnr));
+      // Fortify_LabelPointer(pci->pszFmtFileSize, buf);
+    }
+#   endif
     memcpy(pci->pszFileName, pszDirectory, c + 1);
     p = pci->pszFileName + c - 1;
@@ -353 +365 @@
           value = pfea->szName + pfea->cbName + 1;
           value[pfea->cbValue] = 0;
-          if (*(USHORT *) value == EAT_ASCII)
+          if (*(USHORT *) value == EAT_ASCII) {
             pci->pszLongName = xstrdup(value + (sizeof(USHORT) * 2), pszSrcFile, __LINE__);
+#           ifdef FORTIFY
+            {
+              unsigned tid = GetTidForWindow(hwndCnr);
+              // char buf[256];
+              if (tid == 1)
+                Fortify_ChangeScope(pci->pszLongName, -1);
+              else
+                Fortify_SetOwner(pci->pszLongName, 1);
+              // sprintf(buf, "Owner forced to %u", GetTidForWindow(hwndCnr));
+              // Fortify_LabelPointer(pci->pszFmtFileSize, buf);
+            }
+#           endif
+          }
         }
         free(pfealist);
@@ -428 +453 @@
   //comma format the file size for large file support
   {
-  CHAR szBuf[30];
+    CHAR szBuf[30];
     CommaFmtULL(szBuf, sizeof(szBuf), pffb->cbFile, ' ');
     pci->pszFmtFileSize = xstrdup(szBuf, pszSrcFile, __LINE__);
+#   ifdef FORTIFY
+    {
+      unsigned tid = GetTidForWindow(hwndCnr);
+      // char buf[256];
+      if (tid == 1)
+        Fortify_ChangeScope(pci->pszFmtFileSize, -1);
+      else
+        Fortify_SetOwner(pci->pszFmtFileSize, 1);
+      // sprintf(buf, "Owner forced to %u", GetTidForWindow(hwndCnr));
+      // Fortify_LabelPointer(pci->pszFmtFileSize, buf);
+    }
+#   endif
   }