diff options
| author | Michael Snyder <msnyder@specifix.com> | 2011-03-01 01:44:22 +0000 |
|---|---|---|
| committer | Michael Snyder <msnyder@specifix.com> | 2011-03-01 01:44:22 +0000 |
| commit | a9fd35627defc77e0864835ebaa95785c0cb70b0 (patch) | |
| tree | 48282d161c3d21124201b9e6e48bff08aab32e35 /gdb | |
| parent | 32ae5aedbc0a47689187febe7c5f40d660f91a59 (diff) | |
| download | gdb-a9fd35627defc77e0864835ebaa95785c0cb70b0.tar.gz | |
2011-02-28 Michael Snyder <msnyder@vmware.com>
* objc-lang.c (selectors_info): Add a small safety margin to
avoid overflow.
(classes_info): Error out on too long REGEXP.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/objc-lang.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 90e9c001359..b1b8bf9d0a4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2011-02-28 Michael Snyder <msnyder@vmware.com> + * objc-lang.c (selectors_info): Add a small safety margin to + avoid overflow. + (classes_info): Error out on too long REGEXP. + * infrun.c (handle_inferior_event): Remove unused function call. * fork-child.c (fork_inferior): Remove ifdef'd code and diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c index 26b7fb1d124..d656044c7fd 100644 --- a/gdb/objc-lang.c +++ b/gdb/objc-lang.c @@ -720,7 +720,7 @@ selectors_info (char *regexp, int from_tty) strcpy(myregexp, ".*]"); else { - if (sizeof (myregexp) < strlen (regexp) + 1) + if (sizeof (myregexp) < strlen (regexp) + 4) error (_("Regexp is too long: %s"), regexp); strcpy(myregexp, regexp); if (myregexp[strlen(myregexp) - 1] == '$') /* end of selector */ @@ -863,6 +863,8 @@ classes_info (char *regexp, int from_tty) strcpy(myregexp, ".* "); /* Null input: match all objc classes. */ else { + if (sizeof (myregexp) < strlen (regexp) + 4) + error (_("Regexp is too long: %s"), regexp); strcpy(myregexp, regexp); if (myregexp[strlen(myregexp) - 1] == '$') /* In the method name, the end of the class name is marked by ' '. */ |