From 5a0ba8c9eea209cab241dda53409c76d4a90d1c7 Mon Sep 17 00:00:00 2001 From: Loren James Rittle Date: Thu, 19 Dec 2002 05:22:53 +0000 Subject: [PATCH] gcc.c (validate_switches): Robustify against skipping past '\0'. 2002-12-18 Loren James Rittle * gcc.c (validate_switches): Robustify against skipping past '\0'. From-SVN: r60283 --- gcc/ChangeLog | 4 ++++ 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 + + * gcc.c (validate_switches): Robustify against skipping past '\0'. + 2002-12-18 Geoffrey Keating * 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; } -- 2.30.2