diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-18 21:08:12 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-12-18 21:08:12 +0000 |
| commit | 44713a60bcffef33cf09037090428478803763b1 (patch) | |
| tree | 88cc299f8f3a5bb49ba89a67620f0e03919ff478 | |
| parent | bea60412cb36fdb5f9a45694cf42cc3823657706 (diff) | |
| download | ATCD-44713a60bcffef33cf09037090428478803763b1.tar.gz | |
ChangeLogTag:Wed Dec 18 15:03:03 2002 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 19 | ||||
| -rw-r--r-- | ace/Get_Opt.cpp | 8 |
3 files changed, 34 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 7bfac3b9c38..fc993dadd49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Dec 18 15:03:03 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Get_Opt.cpp (long_option): For MSVC 7.x compiler, we need to + make sure that the argument passed to "isalnum" is legal, i.e., + between 0 and 0xff, otherwise, it will crash the process. Added + a special case for MSVC 7.x and above to prevent this. + Wed Dec 18 13:36:49 2002 Steve Huston <shuston@riverace.com> * ace/ace.mwc: Workspace definition file for ACE and it's immediate @@ -12,13 +19,13 @@ Wed Dec 18 13:36:49 2002 Steve Huston <shuston@riverace.com> Wed Dec 18 11:38:39 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/config-win32-msvc-7.h: Added pragma prefix to disable - warning of using Microsoft extension. + * ace/config-win32-msvc-7.h: Added pragma prefix to disable + warning of using Microsoft extension. - * ace/Timeprobe.h: Removed MSVC specific disabling and re-enabling - of warning of using Microsoft entension. We already do this - through all the MSVC config files and there's no point of doing - this again here. + * ace/Timeprobe.h: Removed MSVC specific disabling and re-enabling + of warning of using Microsoft entension. We already do this + through all the MSVC config files and there's no point of doing + this again here. Mon Dec 16 16:34:23 2002 Nanbor Wang <nanbor@cs.wustl.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 7bfac3b9c38..fc993dadd49 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Wed Dec 18 15:03:03 2002 Nanbor Wang <nanbor@cs.wustl.edu> + + * ace/Get_Opt.cpp (long_option): For MSVC 7.x compiler, we need to + make sure that the argument passed to "isalnum" is legal, i.e., + between 0 and 0xff, otherwise, it will crash the process. Added + a special case for MSVC 7.x and above to prevent this. + Wed Dec 18 13:36:49 2002 Steve Huston <shuston@riverace.com> * ace/ace.mwc: Workspace definition file for ACE and it's immediate @@ -12,13 +19,13 @@ Wed Dec 18 13:36:49 2002 Steve Huston <shuston@riverace.com> Wed Dec 18 11:38:39 2002 Nanbor Wang <nanbor@cs.wustl.edu> - * ace/config-win32-msvc-7.h: Added pragma prefix to disable - warning of using Microsoft extension. + * ace/config-win32-msvc-7.h: Added pragma prefix to disable + warning of using Microsoft extension. - * ace/Timeprobe.h: Removed MSVC specific disabling and re-enabling - of warning of using Microsoft entension. We already do this - through all the MSVC config files and there's no point of doing - this again here. + * ace/Timeprobe.h: Removed MSVC specific disabling and re-enabling + of warning of using Microsoft entension. We already do this + through all the MSVC config files and there's no point of doing + this again here. Mon Dec 16 16:34:23 2002 Nanbor Wang <nanbor@cs.wustl.edu> diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp index 3f6473b5995..7b6a5511899 100644 --- a/ace/Get_Opt.cpp +++ b/ace/Get_Opt.cpp @@ -457,7 +457,15 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, // when the long option is found, but won't allow the caller to pass it on // the command line (how could they?). The special case is 0, but since // we always return it, we let the caller worry about that. +#if defined (_MSC_VER) && (_MSC_VER >= 1300) + // For MSVC 7.x, we need to prevent "illegal" character getting into + // isalnum, otherwise, it will crash the program. + if (short_option > 0 && + short_option < 256 && + isalnum (short_option) != 0) +#else if (isalnum (short_option) != 0) +#endif /* _MSC_VER && _MSC_VER >= 1300 */ { // If the short_option already exists, make sure it matches, otherwise // add it. |