Changeset 1079 for trunk/dll/tools.c

Timestamp:

Jul 19, 2008, 6:41:55 AM (17 years ago)

Author:

Steven Levine

Message:

Avoid some more spurious leak reports

File:

• trunk/dll/tools.c (modified) (2 diffs)

trunk/dll/tools.c

@@ -34 +34 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "fortify.h"
 #include "fm3dll.h"
-#include "fortify.h"
 
 #pragma data_seg(DATA1)
@@ -146 +146 @@
         info = xmallocz(sizeof(TOOL), pszSrcFile, __LINE__);
         if (info) {
+#         ifdef FORTIFY
+          Fortify_SetOwner(info, 1);
+          Fortify_SetScope(info, 1);
+#         endif
           if (*help) {
             literal(help);
-            if (*help)
+            if (*help) {
               info->help = xstrdup(help, pszSrcFile, __LINE__);
+#             ifdef FORTIFY
+              Fortify_SetOwner(info->help, 1);
+              Fortify_SetScope(info->help, 1);
+#             endif
+            }
           }
-          if (*text)
+          if (*text) {
             info->text = xstrdup(text, pszSrcFile, __LINE__);
+#           ifdef FORTIFY
+            Fortify_SetOwner(info->text, 1);
+            Fortify_SetScope(info->text, 1);
+#           endif
+          }
           info->flags = (atoi(flagstr) & (~(T_TEXT | T_EMPHASIZED)));
           info->id = (USHORT) atoi(idstr);