From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35883-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 27123 invoked by alias); 24 Jul 2015 08:53:33 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 35883
Received: (qmail 580 invoked from network); 24 Jul 2015 08:53:29 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI,
	RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham
	autolearn_force=no version=3.4.0
X-AuditID: cbfec7f4-f79c56d0000012ee-bc-55b1fd057a16
Date: Fri, 24 Jul 2015 09:53:22 +0100
From: Peter Stephenson <p.stephenson@samsung.com>
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: SEGV with alias\
Message-id: <20150724095322.7dba34af@pwslap01u.europe.root.pri>
In-reply-to: <150723193351.ZM16103@torch.brasslantern.com>
References: <20150723215250.GG1847@tarsus.local2>
 <CAH+w=7Zh+iYEtgXsKHCHD6M78sc0YqWt6TzZVBL=EE3ZrNP5BA@mail.gmail.com>
 <150723193351.ZM16103@torch.brasslantern.com>
Organization: Samsung Cambridge Solution Centre
X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu)
MIME-version: 1.0
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7bit
X-Brightmail-Tracker:
 H4sIAAAAAAAAA+NgFjrELMWRmVeSWpSXmKPExsVy+t/xy7qsfzeGGiz5L2JxsPkhkwOjx6qD
	H5gCGKO4bFJSczLLUov07RK4Mq7N3MBacJOjomf3BbYGxitsXYycHBICJhLzdm5igbDFJC7c
	Ww8U5+IQEljKKHF35yRmCGcGk8TbZbdYIJxtjBK3X7xkBGlhEVCVeDV7DxOIzSZgKDF102yw
	uIiAlsSOkyeB4hwcwgKyEi3bhUDCvAL2EmfnTWEFCXMKWEnseCUPEhYSWMEoca9NFcTmF9CX
	uPr3ExPEQfYSM6+cYYRoFZT4Mfke2KHMQNM3b2tihbDlJTavecsMMUdd4sbd3ewTGIVmIWmZ
	haRlFpKWBYzMqxhFU0uTC4qT0nMN9YoTc4tL89L1kvNzNzFCQvbLDsbFx6wOMQpwMCrx8B6Y
	tDFUiDWxrLgy9xCjBAezkggvwzGgEG9KYmVValF+fFFpTmrxIUZpDhYlcd65u96HCAmkJ5ak
	ZqemFqQWwWSZODilGhiZ3rOev6HiaM471/u75iUuj4+Sl3cf+iau++3W7IMayTVFCYtZ/kfv
	5G9SnKV4aIaIhvFen97YbpdMtxK+bfOkth8o0pJRaU9fwVZWGXVZqmqjMJNCyorgqaUFRstM
	Ond8t9s8I3rGht2/fuWc/hLEtyQ5v8vnvPzp0P6eh552QgkMUz0nHVdiKc5INNRiLipOBAAA
	DGJnVQIAAA==

On Thu, 23 Jul 2015 19:33:51 -0700
Bart Schaefer <schaefer@brasslantern.com> wrote:
> On Jul 23,  3:18pm, Bart Schaefer wrote:
> } Subject: Re: SEGV with alias\
> }
> } On Thu, Jul 23, 2015 at 2:52 PM, Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
> } > [CCing reporter of the recent ihungetc() issue]
> } >
> } > Typing <l><s><Backslash><Enter><Enter> may segfault if 'ls' is aliased.
> } 
> 
> It doesn't crash any more, but with debug enabled it prints
>     Warning: backing up wrong character.
> forever.

I can stop this cleanly, but I still don't know what the code chunk is
doing.

pws

diff --git a/Src/hist.c b/Src/hist.c
index cf224cb..75e809c 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -906,7 +906,8 @@ ihungetc(int c)
     while (!lexstop && !errflag) {
 	if (hptr[-1] != (char) c && stophist < 4 &&
 	    hptr > chline + 1 && hptr[-1] == '\n' && hptr[-2] == '\\' &&
-	    !(histactive & HA_UNGET)) {
+	    !(histactive & HA_UNGET) &&
+	    (inbufflags & (INP_ALIAS|INP_HIST)) != INP_ALIAS) {
 	    histactive |= HA_UNGET;
 	    hungetc('\n');
 	    hungetc('\\');