mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-29 06:51:03 +02:00
Code Releases Activity

Fix two bugs in typeset_setbase

Browse source
This commit is contained in:
Mikael Magnusson 2015-05-03 22:34:23 +02:00
parent 5b00bfecac
commit 1e6fb1a4f0
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2015-05-04 Mikael Magnusson <mikachu@gmail.com>
* 35021: Src/builtin.c: Fix two bugs in typeset_setbase
2015-05-03 Peter Stephenson <p.w.stephenson@ntlworld.com> 2015-05-03 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 35018 (corrected): NEWS: news. * 35018 (corrected): NEWS: news.

7
Src/builtin.c
View file

@ -1868,7 +1868,7 @@ typeset_setbase(const char *name, Param pm, Options ops, int on, int always)
if (arg) { if (arg) {
char *eptr; char *eptr;
pm->base = (int)zstrtol(arg, &eptr, 10); int base = (int)zstrtol(arg, &eptr, 10);
if (*eptr) { if (*eptr) {
if (on & PM_INTEGER) if (on & PM_INTEGER)
zwarnnam(name, "bad base value: %s", arg); zwarnnam(name, "bad base value: %s", arg);
@ -1876,11 +1876,12 @@ typeset_setbase(const char *name, Param pm, Options ops, int on, int always)
zwarnnam(name, "bad precision value: %s", arg); zwarnnam(name, "bad precision value: %s", arg);
return 1; return 1;
} }
if (pm->base < 2 || pm->base > 36) { if ((on & PM_INTEGER) && (base < 2 || base > 36)) {
zwarnnam(name, "invalid base (must be 2 to 36 inclusive): %d", zwarnnam(name, "invalid base (must be 2 to 36 inclusive): %d",
pm->base); base);
return 1; return 1;
} }
pm->base = base;
} else if (always) } else if (always)
pm->base = 0; pm->base = 0;