zsh-workers
 help / color / mirror / code / Atom feed
From: Stephane Chazelas <stephane@chazelas.org>
To: Bart Schaefer <schaefer@brasslantern.com>
Cc: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: Example / partial fix for printf with math expressions
Date: Sat, 24 Feb 2024 14:40:41 +0000	[thread overview]
Message-ID: <20240224144041.7huny3lmihsrokdm@chazelas.org> (raw)
In-Reply-To: <CAH+w=7Z+vjX7sAgajLsQJw2KkZtyvaZvvJ+-=-7rMFH7p9+j7g@mail.gmail.com>

2024-02-23 15:23:52 -0800, Bart Schaefer:
> No attachment, so beware line wrap.
> 
> This repairs (printf "%d" ...) but obviously hasn't touched any of the
> several other places where bin_print() calls matheval() and friends.
> Upshot, math expects to get metafied strings, bin_print() does not (or
> at least not always) pass them that way.
> 
> I also did not investigate whether curarg needs a known length rather
> than calling metafy with -1, but since math is internally going to
> stop at nul bytes anyway, I don't think it matters.
[...]

Ah sorry, I hadn't seen that message when replying in the other
thread.

The math parser seems to work OK with NULs at least in:

$ typeset -A a
$ typeset -p a
typeset -A a=( [$'\C-@']=1 )
$ let $'b = (a = ##\0) + 32'; echo $a $b
0 32


With and without your example patch applied however:

$ printf '%d\n' $'a[\0]++'
zsh: invalid subscript
0

With the one below using curlen / len[argp-args]:

$ typeset -A a
$ printf '%d\n' $'a[\0]++'
0
$ typeset -p a
typeset -A a=( [$'\C-@']=1 )

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;



  reply	other threads:[~2024-02-24 14:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-23 23:23 Bart Schaefer
2024-02-24 14:40 ` Stephane Chazelas [this message]
2024-02-24 15:10   ` Stephane Chazelas
2024-02-24 21:51   ` Bart Schaefer
2024-02-25  6:54   ` Stephane Chazelas
2024-02-26  0:04     ` Bart Schaefer
2024-02-26 17:12       ` Bart Schaefer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240224144041.7huny3lmihsrokdm@chazelas.org \
    --to=stephane@chazelas.org \
    --cc=schaefer@brasslantern.com \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).