diff options
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/gcc.c | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1f4c8710b6f..143b5c2aac0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2002-12-18 Loren James Rittle <rittle@labs.mot.com> + + * gcc.c (validate_switches): Robustify against skipping past '\0'. + 2002-12-18 Geoffrey Keating <geoffk@apple.com> * config.gcc: Set extra_objs in the generic Darwin rule, diff --git a/gcc/gcc.c b/gcc/gcc.c index dea12aac935..85f792b6786 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -6808,11 +6808,11 @@ next_member: switches[i].validated = 1; } - p++; - if (p[-1] == '|' || p[-1] == '&') + if (*p) p++; + if (*p && (p[-1] == '|' || p[-1] == '&')) goto next_member; - if (p[-1] == ':') + if (*p && p[-1] == ':') { while (*p && *p != ';' && *p != '}') { @@ -6824,11 +6824,11 @@ next_member: else if (p[0] == 'W' && p[1] == '{') p = validate_switches (p+2); } - p++; + if (*p) p++; } - p++; - if (p[-1] == ';') + if (*p) p++; + if (*p && p[-1] == ';') goto next_member; } |