Date: Wed, 20 Feb 2008 09:30:36 -0800 From: Mark Peek <mp@FreeBSD.org> To: Rui Paulo <rpaulo@fnop.net> Cc: freebsd-current@freebsd.org, re@freebsd.org, Anton Yuzhaninov <citrin@citrin.ru> Subject: Re: tcsh in current-8.0 coredump Message-ID: <47BC63BC.4080003@FreeBSD.org> In-Reply-To: <A82E7FE0-0551-423A-9684-0C48781A1561@fnop.net> References: <47BB4E5D.7010505@citrin.ru> <7F7C8315-AB96-425E-B942-0DB55BFDBCF3@FreeBSD.org> <47BC2AAB.5090605@citrin.ru> <A82E7FE0-0551-423A-9684-0C48781A1561@fnop.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2/20/08 8:05 AM, 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. That's really odd. I thought RELENG_7 didn't branch until 10/10/2007 but the postcmd fix was imported on 4/3/2007. In other words, I thought it was already in RELENG_7. But CVS still thinks the two are different. I can MFC it whenever re@ approves it given we're at 7.0-RC2. Mark
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?47BC63BC.4080003>