Permalink
Browse files

Danek: 30485: trailing garbage after signal number not recognised in …

…kill
  • Loading branch information...
1 parent 338c70f commit d64e62ef11fc9e37acd19d77d4927538ba755787 Peter Stephenson committed May 22, 2012
Showing with 14 additions and 4 deletions.
  1. +6 −1 ChangeLog
  2. +8 −3 Src/jobs.c
View
@@ -1,3 +1,8 @@
+2012-05-22 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * Danek: 30485: Src/jobs.c: trailing garbage after signal
+ number not recognised in kill builtin.
+
2012-05-21 Peter Stephenson <pws@csr.com>
* c.f 30482 (Peter Jaros): Completion/Unix/Command/_tmux: typo
@@ -16313,5 +16318,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5656 $
+* $Revision: 1.5657 $
*****************************************************
View
@@ -2164,10 +2164,15 @@ bin_kill(char *nam, char **argv, UNUSED(Options ops), UNUSED(int func))
/* check for, and interpret, a signal specifier */
if (*argv && **argv == '-') {
- if (idigit((*argv)[1]))
+ if (idigit((*argv)[1])) {
+ char *endp;
/* signal specified by number */
- sig = atoi(*argv + 1);
- else if ((*argv)[1] != '-' || (*argv)[2]) {
+ sig = zstrtol(*argv + 1, &endp, 10);
+ if (*endp) {
+ zwarnnam(nam, "invalid signal number: %s", *argv);
+ return 1;
+ }
+ } else if ((*argv)[1] != '-' || (*argv)[2]) {
char *signame;
/* with argument "-l" display the list of signal names */

0 comments on commit d64e62e

Please sign in to comment.