From owner-freebsd-current@FreeBSD.ORG Wed Feb 20 16:05:14 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 E368516A400 for ; Wed, 20 Feb 2008 16:05:14 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.189]) by mx1.freebsd.org (Postfix) with ESMTP id 56EC713C442 for ; Wed, 20 Feb 2008 16:05:14 +0000 (UTC) (envelope-from rpaulo@gmail.com) Received: by mu-out-0910.google.com with SMTP id w9so2075200mue.6 for ; Wed, 20 Feb 2008 08:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:cc:message-id:from:to:in-reply-to:content-type:content-transfer-encoding:mime-version:subject:date:references:x-mailer:sender; bh=L1bZdkxokXgERXxkvMkj/D3f7YfPajTaiLBUwRO1/cQ=; b=H7SGJMbHRgaUS5gpgXBsCjCqnlG7J+v60FfPUX/WDrSp6LufABXJUAIRsOlAGmsr7JPg6NKofqdB52la9zS+tmEo8lTqujkE1DCNmB7sSo7y21wRad1NrTqPJORo0Xh9oEbCGwi4m7NCmYN/jeFnqoVNxZb3aNPsU2A8SFkQ5rM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=cc:message-id:from:to:in-reply-to:content-type:content-transfer-encoding:mime-version:subject:date:references:x-mailer:sender; b=ruFE1X6uiaNfwn0GfShAdWqhFyaAGBYdxoSsLi/0hXa8y5q7rkC+31+AVfV9NthcA2iLJOBkVQeM3ya8MBotxQTuH+/CyxY3dY8+kcpNZikb1SY+bzg4Ecc6+L432o/IoJEfW9e7YFF5qOtlmoU58u7LXhG40JySx0ndukwVXdo= Received: by 10.78.134.2 with SMTP id h2mr13675492hud.17.1203523512988; Wed, 20 Feb 2008 08:05:12 -0800 (PST) Received: from Epsilon.local ( [193.126.196.169]) by mx.google.com with ESMTPS id i3sm19440975nfh.28.2008.02.20.08.05.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Feb 2008 08:05:12 -0800 (PST) Message-Id: From: Rui Paulo To: Anton Yuzhaninov In-Reply-To: <47BC2AAB.5090605@citrin.ru> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v919.2) Date: Wed, 20 Feb 2008 16:05:07 +0000 References: <47BB4E5D.7010505@citrin.ru> <7F7C8315-AB96-425E-B942-0DB55BFDBCF3@FreeBSD.org> <47BC2AAB.5090605@citrin.ru> X-Mailer: Apple Mail (2.919.2) Sender: Rui Paulo X-Mailman-Approved-At: Wed, 20 Feb 2008 16:46:30 +0000 Cc: freebsd-current@freebsd.org, re@freebsd.org 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 16:05:15 -0000 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. Regards. -- Rui Paulo