darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* strings.c (main): New variable `s'. Have string_min parsing

Browse source 
call fatal for invalid input strings.
This commit is contained in:
Jan Kratochvil 2008-11-26 14:24:35 +00:00
parent a85c0b494e
commit 508e676df1
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
binutils/ChangeLog
View file

@ -1,3 +1,8 @@
2008-11-26 Jan Kratochvil <jan.kratochvil@redhat.com>
* strings.c (main): New variable `s'. Have string_min parsing
call fatal for invalid input strings.
2008-11-25 Nick Clifton <nickc@redhat.com> 2008-11-25 Nick Clifton <nickc@redhat.com>
PR7044 PR7044

9
binutils/strings.c
View file

@ -155,6 +155,7 @@ main (int argc, char **argv)
int optc; int optc;
int exit_status = 0; int exit_status = 0;
bfd_boolean files_given = FALSE; bfd_boolean files_given = FALSE;
char *s;
#if defined (HAVE_SETLOCALE) #if defined (HAVE_SETLOCALE)
setlocale (LC_ALL, ""); setlocale (LC_ALL, "");
@ -192,7 +193,9 @@ main (int argc, char **argv)
usage (stdout, 0); usage (stdout, 0);
case 'n': case 'n':
string_min = (int) strtoul (optarg, NULL, 0); string_min = (int) strtoul (optarg, &s, 0);
if (s != NULL && *s != 0)
fatal (_("invalid integer argument %s"), optarg);
break; break;
case 'o': case 'o':
@ -242,7 +245,9 @@ main (int argc, char **argv)
usage (stderr, 1); usage (stderr, 1);
default: default:
string_min = (int) strtoul (argv[optind - 1] + 1, NULL, 0); string_min = (int) strtoul (argv[optind - 1] + 1, &s, 0);
if (s != NULL && *s != 0)
fatal (_("invalid integer argument %s"), argv[optind - 1] + 1);
break; break;
} }
} }