mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

37497: handle NUL bytes in "printf -v".

Browse source
This commit is contained in:
Barton E. Schaefer 2016-01-02 13:57:35 -08:00
parent 03adf52414
commit 63c6d1746c
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2016-01-02 Barton E. Schaefer <schaefer@zsh.org>
* 37497: Src/builtin.c: handle NUL bytes in "printf -v".
* 37493: Doc/Zsh/builtins.yo, Src/builtin.c, Src/hashtable.h,
Test/B02typeset.ztst: readonly + POSIX_BUILTINS == typeset -gr

11
Src/builtin.c
View file

@ -4872,17 +4872,20 @@ bin_print(char *name, char **args, Options ops, int func)
if (OPT_ISSET(ops,'z') || OPT_ISSET(ops,'s') || OPT_ISSET(ops,'v')) {
#ifdef HAVE_OPEN_MEMSTREAM
putc(0, fout);
putc(0, fout); /* not needed? open_memstream() maintains? */
fclose(fout);
fout = NULL;
rcount = mcount; /* now includes the trailing NUL we added */
#else
rewind(fout);
buf = (char *)zalloc(count + 1);
fread(buf, count, 1, fout);
buf[count] = '\0';
rcount = fread(buf, count, 1, fout);
if (rcount < count)
zwarnnam(name, "i/o error: %e", errno);
buf[rcount] = '\0';
#endif
queue_signals();
stringval = metafy(buf, -1, META_REALLOC);
stringval = metafy(buf, rcount - 1, META_REALLOC);
if (OPT_ISSET(ops,'z')) {
zpushnode(bufstack, stringval);
} else if (OPT_ISSET(ops,'v')) {