diff options
| author | Stephane Chazelas <stephane@chazelas.org> | 2024-02-24 20:41:33 -0800 |
|---|---|---|
| committer | Bart Schaefer <schaefer@zsh.org> | 2024-02-24 20:41:33 -0800 |
| commit | 4c0ebc155ebab1e2babda2a218cba1131cf74109 (patch) | |
| tree | d88573b7e855a90e292518b045fb7e3a8af02e97 | |
| parent | 4b9cd6b8bd5f67500e716f8485aebd31a9f7cf47 (diff) | |
| download | zsh-4c0ebc155ebab1e2babda2a218cba1131cf74109.tar.gz zsh-4c0ebc155ebab1e2babda2a218cba1131cf74109.tar.xz zsh-4c0ebc155ebab1e2babda2a218cba1131cf74109.zip | |
52591: printf builtin must pass metafied strings to math evaluation
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/builtin.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d520ec8c5..00a3c65ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-02-24 Bart Schaefer <schaefer@zsh.org> + + * Stephane: 52591: Src/builtin.c: printf builtin must pass + metafied strings to math evaluation + 2024-02-23 Bart Schaefer <schaefer@zsh.org> * 52583: Src/params.c, Test/V10private.ztst: do an extra check diff --git a/Src/builtin.c b/Src/builtin.c index dd352c146..f72d14da4 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -5247,7 +5247,8 @@ bin_print(char *name, char **args, Options ops, int func) } } if (*argp) { - width = (int)mathevali(*argp++); + width = (int)mathevali(metafy(*argp, len[argp - args], META_USEHEAP)); + argp++; if (errflag) { errflag &= ~ERRFLAG_ERROR; ret = 1; @@ -5281,7 +5282,8 @@ bin_print(char *name, char **args, Options ops, int func) } if (*argp) { - prec = (int)mathevali(*argp++); + prec = (int)mathevali(metafy(*argp, len[argp - args], META_USEHEAP)); + argp++; if (errflag) { errflag &= ~ERRFLAG_ERROR; ret = 1; @@ -5465,7 +5467,7 @@ bin_print(char *name, char **args, Options ops, int func) *d++ = 'l'; #endif *d++ = 'l', *d++ = *c, *d = '\0'; - zlongval = (curarg) ? mathevali(curarg) : 0; + zlongval = (curarg) ? mathevali(metafy(curarg, curlen, META_HEAPDUP)) : 0; if (errflag) { zlongval = 0; errflag &= ~ERRFLAG_ERROR; @@ -5516,7 +5518,7 @@ bin_print(char *name, char **args, Options ops, int func) if (!curarg) zulongval = (zulong)0; else if (!zstrtoul_underscore(curarg, &zulongval)) - zulongval = mathevali(curarg); + zulongval = mathevali(metafy(curarg, curlen, META_HEAPDUP)); if (errflag) { zulongval = 0; errflag &= ~ERRFLAG_ERROR; |