Mon Sep 10 13:22:38 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

6 files changed, 25 insertions, 1 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 537d22e846d..1bee41adf94 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,15 @@
+Mon Sep 10 13:22:38 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * apps/JAWS/stress_testing/util.cpp:
+        * apps/drwho/Multicast_Manager.cpp:
+        * apps/drwho/Options.cpp:
+        * bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp:
+        * bin/LabVIEW_RT/labview_test_controller/test.cpp:
+
+          Fixed ACE_OS fuzz warnings. Use ACE_OS calls instead of raw OS functions
+          where possible. If fuzz detected a false-positive, then disable
+          the ACE_OS fuzz check for that section of the code.
+
 Mon Sep 10 12:17:24 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tests/MT_Reference_Counted_Event_Handler_Test.cpp:
diff --git a/ACE/apps/JAWS/stress_testing/util.cpp b/ACE/apps/JAWS/stress_testing/util.cpp
index c773f043c58..495ba7c59e0 100644
--- a/ACE/apps/JAWS/stress_testing/util.cpp
+++ b/ACE/apps/JAWS/stress_testing/util.cpp
@@ -21,7 +21,7 @@ URL::URL(char *input_buf) {
   }
 
   if((temp = ACE_OS::strtok_r(0,"/",&lasts)))  {
-    hostname_ = (char *) ACE_OS::malloc(strlen(temp) + 1);
+    hostname_ = (char *) ACE_OS::malloc(ACE_OS::strlen(temp) + 1);
     ACE_OS::strcpy(hostname_, temp);
   }
   if((temp = ACE_OS::strtok_r(0,"\0",&lasts))) {
diff --git a/ACE/apps/drwho/Multicast_Manager.cpp b/ACE/apps/drwho/Multicast_Manager.cpp
index 44e94744b5b..8606138aa59 100644
--- a/ACE/apps/drwho/Multicast_Manager.cpp
+++ b/ACE/apps/drwho/Multicast_Manager.cpp
@@ -38,7 +38,9 @@ Multicast_Manager::insert_default_hosts (void)
 int
 Multicast_Manager::insert_hosts_from_file (const char *filename)
 {
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Mem_Map mmap (filename);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   char *host_ptr = (char *) mmap.addr ();
 
diff --git a/ACE/apps/drwho/Options.cpp b/ACE/apps/drwho/Options.cpp
index 0cda644da72..a84b69bf936 100644
--- a/ACE/apps/drwho/Options.cpp
+++ b/ACE/apps/drwho/Options.cpp
@@ -80,10 +80,12 @@ Options::set_options (int argc, char *argv[])
 
   Options::program_name = argv[0];
 
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, "?aA:bdF:f:hH:Llp:rRsSt:w:");
 
   while ((c = getopt ()) != -1)
     {
+  //FUZZ: endable check_for_lack_ACE_OS
       switch (c)
         {
         case '?':
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
index f2fb8fac1fe..728c847121c 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
@@ -25,6 +25,10 @@
 // Windows code, not ACE, so we stick to the Microsoft way...
 // FUZZ: disable check_for_NULL
 
+// This is plain Windows code, not ACE. Therefore we disable 
+// the check for ACE_OS
+// FUZZ: disable check_for_lack_ACE_OS
+
 // TEST_FUNC is the prototype for the called test's main entrypoint. It's
 // the normal C main.
 typedef int (*TEST_FUNC) (int argc, char *argv[]);
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
index 7a9e98c964e..4c2a2589fb4 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
@@ -3,6 +3,10 @@
 #include <stdio.h>
 __declspec(dllimport) int test_entry(void);
 
+// This is plain Windows code, not ACE. Therefore we disable 
+// the check for ACE_OS
+// FUZZ: disable check_for_lack_ACE_OS
+
 int main (int, char *[])
 {
   char line[80];