From: "Jun T." <takimoto-j@kba.biglobe.ne.jp>
To: zsh-workers@zsh.org
Subject: Re: free() error on simple input scripts
Date: Mon, 8 Dec 2014 21:51:59 +0900 [thread overview]
Message-ID: <9CCB71BC-6744-4FF8-BBBC-EE538DF02732@kba.biglobe.ne.jp> (raw)
In-Reply-To: <141206150753.ZM2978@torch.brasslantern.com>
After the commit
48cd1b6c3b51a7bc6d45d4aeb7ff8c55d97a6f2a
33894: boundary conditions in unmeta(), unmetafy()
test D07multibyte fails on my Mac as follows:
./D07multibyte.ztst: starting.
Testing multibyte with locale en_US.UTF-8
Test ./D07multibyte.ztst failed: bad status 134, expected 0 from:
mkdir 梶浦由記 'Пётр Ильич Чайковский'
(cd 梶浦由記; print ${${(%):-%~}:t})
(cd 'Пётр Ильич Чайковский'; print ${${(%):-%~}:t})
Error output:
zsh(74285,0x7fff72bb3310) malloc: *** error for object 0x7f8162504998: incorrect checksum for freed object - object was probably modified after being freed.
*** set a breakpoint in malloc_error_break to debug
Was testing: Metafied characters in prompt expansion
./D07multibyte.ztst: test failed.
It seems the problem is in the following hunk:
> @@ -4208,8 +4208,10 @@ unmeta(const char *file_name)
>
> meta = 0;
> for (t = file_name; *t; t++) {
> - if (*t == Meta)
> - meta = 1;
> + if (*t == Meta) {
> + meta = t[1];
> + break;
> + }
> }
Breaking out of the for-loop leaves the pointer t at the first Meta
in file_name, and the value of newsz becomes too small.
How about the following?
diff --git a/Src/utils.c b/Src/utils.c
index 5c90638..ab3d3da 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -4208,10 +4208,8 @@ unmeta(const char *file_name)
meta = 0;
for (t = file_name; *t; t++) {
- if (*t == Meta) {
- meta = t[1];
- break;
- }
+ if (*t == Meta)
+ meta = 1;
}
if (!meta) {
/*
@@ -4250,7 +4248,7 @@ unmeta(const char *file_name)
}
for (t = file_name, p = fn; *t; p++)
- if ((*p = *t++) == Meta)
+ if ((*p = *t++) == Meta && *t)
*p = *t++ ^ 32;
*p = '\0';
return fn;
next prev parent reply other threads:[~2014-12-08 13:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-06 4:27 Dennis Felsing
2014-12-06 23:07 ` Bart Schaefer
2014-12-07 6:36 ` Bart Schaefer
2014-12-09 15:45 ` Jun T.
2014-12-09 17:30 ` Peter Stephenson
2014-12-09 22:13 ` Bart Schaefer
2014-12-08 12:51 ` Jun T. [this message]
2014-12-08 16:37 ` 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=9CCB71BC-6744-4FF8-BBBC-EE538DF02732@kba.biglobe.ne.jp \
--to=takimoto-j@kba.biglobe.ne.jp \
--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).