From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5882 invoked from network); 11 Mar 2005 10:30:47 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 11 Mar 2005 10:30:47 -0000 Received: (qmail 80224 invoked from network); 11 Mar 2005 10:30:40 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 11 Mar 2005 10:30:40 -0000 Received: (qmail 5471 invoked by alias); 11 Mar 2005 10:30:37 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20966 Received: (qmail 5450 invoked from network); 11 Mar 2005 10:30:36 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 11 Mar 2005 10:30:36 -0000 Received: (qmail 79951 invoked from network); 11 Mar 2005 10:30:33 -0000 Received: from mailhost1.csr.com (HELO MAILSWEEPER01.csr.com) (81.105.217.43) by a.mx.sunsite.dk with SMTP; 11 Mar 2005 10:30:29 -0000 Received: from exchange03.csr.com (unverified [10.100.137.60]) by MAILSWEEPER01.csr.com (Content Technologies SMTPRS 4.3.12) with ESMTP id for ; Fri, 11 Mar 2005 10:28:56 +0000 Received: from news01.csr.com ([10.103.143.38]) by exchange03.csr.com with Microsoft SMTPSVC(5.0.2195.6713); Fri, 11 Mar 2005 10:32:03 +0000 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.13.1/8.12.11) with ESMTP id j2BAUR9N010122 for ; Fri, 11 Mar 2005 10:30:27 GMT Received: from csr.com (pws@localhost) by news01.csr.com (8.13.1/8.13.1/Submit) with ESMTP id j2BAUQ3H010118 for ; Fri, 11 Mar 2005 10:30:27 GMT Message-Id: <200503111030.j2BAUQ3H010118@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk Subject: Re: Segfault completing in minibuffer In-reply-to: <1050311062613.ZM9684@candle.brasslantern.com> References: <1050311062613.ZM9684@candle.brasslantern.com> Date: Fri, 11 Mar 2005 10:30:26 +0000 From: Peter Stephenson X-OriginalArrivalTime: 11 Mar 2005 10:32:03.0834 (UTC) FILETIME=[910115A0:01C52625] X-Spam-Checker-Version: SpamAssassin 3.0.2 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, score=-2.5 required=6.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.2 X-Spam-Hits: -2.5 Bart Schaefer wrote: > The latest CVS segfaults when completing at the minibuffer prompt for > execute-named-cmd, whether or not unicode support is enabled. Another two uses of unmetafy need the string copying. Probably an allocating version of unmetafy would be more efficient. Index: Src/Zle/zle_misc.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_misc.c,v retrieving revision 1.21 diff -u -r1.21 zle_misc.c --- Src/Zle/zle_misc.c 7 Mar 2005 11:11:27 -0000 1.21 +++ Src/Zle/zle_misc.c 11 Mar 2005 10:28:08 -0000 @@ -911,8 +911,9 @@ showinglist = 0; zmult = zmultsav; } else if (!nextnode(firstnode(namedcmdll))) { - ZLE_STRING_T ztmp = stringaszleline(peekfirst(namedcmdll), - &len, NULL); + char *peekstr = ztrdup(peekfirst(namedcmdll)); + ZLE_STRING_T ztmp = stringaszleline(peekstr, &len, NULL); + zsfree(peekstr); ZS_memcpy(ptr = cmdbuf, ztmp, len); ptr += len; free(ztmp); @@ -920,8 +921,9 @@ goto unambiguous; } else { int ltmp; - ZLE_STRING_T ztmp = stringaszleline(peekfirst(namedcmdll), - <mp, NULL); + char *peekstr = ztrdup(peekfirst(namedcmdll)); + ZLE_STRING_T ztmp = stringaszleline(peekstr, <mp, NULL); + zsfree(peekstr); ZS_memcpy(cmdbuf, ztmp, ltmp); free(ztmp); ptr = cmdbuf + namedcmdambig; -- Peter Stephenson Software Engineer CSR PLC, Churchill House, Cambridge Business Park, Cowley Road Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070 ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. **********************************************************************