From owner-freebsd-current@FreeBSD.ORG Wed Feb 20 18:32:03 2008 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E23016A403 for ; Wed, 20 Feb 2008 18:32:03 +0000 (UTC) (envelope-from citrin@citrin.ru) Received: from mail-chaos.rambler.ru (mail-chaos.rambler.ru [81.19.68.130]) by mx1.freebsd.org (Postfix) with ESMTP id 0298713C458 for ; Wed, 20 Feb 2008 18:32:02 +0000 (UTC) (envelope-from citrin@citrin.ru) Received: from [81.19.90.80] (unknown [81.19.90.80]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: citrin@citrin.ru) by mail-chaos.rambler.ru (Postfix) with ESMTP id 03D1917013 for ; Wed, 20 Feb 2008 21:32:02 +0300 (MSK) Message-ID: <47BC71FF.4020200@citrin.ru> Date: Wed, 20 Feb 2008 21:31:27 +0300 From: Anton Yuzhaninov User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: freebsd-current@freebsd.org References: <47BB4E5D.7010505@citrin.ru> <7F7C8315-AB96-425E-B942-0DB55BFDBCF3@FreeBSD.org> <47BC2AAB.5090605@citrin.ru> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: tcsh in current-8.0 coredump X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2008 18:32:03 -0000 On 20.02.2008 19:05, Rui Paulo wrote: > > On Feb 20, 2008, at 1:27 PM, Anton Yuzhaninov wrote: > >> On 20.02.2008 4:56, Rui Paulo wrote: >>> On Feb 19, 2008, at 9:47 PM, Anton Yuzhaninov wrote: >>>> Problem was described here: >>>> http://docs.freebsd.org/cgi/mid.cgi?131632274.20070319100945 >>>> http://mx.gw.com/pipermail/tcsh-bugs/2007-March/000481.html >>>> >>>> This was fixed for RELENG_7: >>>> >>>> http://www.freebsd.org/cgi/cvsweb.cgi/src/contrib/tcsh/sh.lex.c >>>> Revision 1.1.1.8 (vendor branch): download - view: text, markup, >>>> annotated - select for diffs >>>> Tue Apr 3 15:51:53 2007 UTC (10 months, 2 weeks ago) by mp >>>> Branches: ZOULAS, MAIN >>>> CVS tags: tcsh_6_15p1, RELENG_7_BP, RELENG_7_0_BP, RELENG_7_0, RELENG_7 >>>> Diff to: previous 1.1.1.7: preferred, colored >>>> Changes since revision 1.1.1.7: +2 -1 lines >>>> >>>> Import vendor patch to fix postcmd regression in tcsh-6.15.00. >>>> ------- >>>> >>>> But this bug was not fixed in HEAD. >>>> >>> Are you sure? I seem to recall this was fixed even before RELENG_7 >>> was tagged. >> >> $ cvs up >> $ cvs diff -r HEAD -r RELENG_7 contrib/tcsh/sh.lex.c >> Index: contrib/tcsh/sh.lex.c >> =================================================================== >> RCS file: /home/ncvs/src/contrib/tcsh/sh.lex.c,v >> retrieving revision 1.1.1.9 >> retrieving revision 1.1.1.8 >> diff -u -r1.1.1.9 -r1.1.1.8 >> --- contrib/tcsh/sh.lex.c 15 Oct 2007 16:54:07 -0000 1.1.1.9 >> +++ contrib/tcsh/sh.lex.c 3 Apr 2007 15:51:53 -0000 1.1.1.8 >> @@ -851,7 +851,8 @@ >> return (en); >> } >> slhs.len = 0; >> - Strbuf_append(&slhs, lhsb.s); >> + if (lhsb.s != NULL && lhsb.len != 0) >> + Strbuf_append(&slhs, lhsb.s); >> Strbuf_terminate(&slhs); >> if (exclc) >> en = dosub(sc, en, global); >> >> As you can see from cvs diff, null pointer check present in RELENG_7. >> but absent in HEAD > > Oh, you are right. This was never MFC'ed, but the log says: > > revision 1.1.1.9 > date: 2007/10/15 16:54:07; author: mp; state: Exp; lines: +1 -2 > Import two vendor fixes from tcsh-6.15.01 for MFC to 7.0. The fixes are: > - Fix pty detection for autologout setting > - kill `foo` got stuck because sigchld was disabled too soon > > Requested by: re > > Maybe we should MFC this now. As I can see postcmd fix should be merged from RELENG_7 to HEAD, not vice versa. -- WBR, Anton Yuzhaninov