From 74be46038de399f5d5ba48bef15a3b649b883967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Teichgr=C3=A4ber?= Date: Sat, 8 Aug 2009 16:27:01 -0400 Subject: rc: fix segfault when SIGINT is received Save the value of `runq' at the start of the function, so that the `pc' update at the end does work on that original value, and not on a probably modified value of `runq'. fixes #14 http://code.swtch.com/plan9port/issue/14/ http://codereview.appspot.com/104066 --- src/cmd/rc/havefork.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/rc/havefork.c b/src/cmd/rc/havefork.c index 45419f0d..62d52c2c 100644 --- a/src/cmd/rc/havefork.c +++ b/src/cmd/rc/havefork.c @@ -110,6 +110,7 @@ Xpipe(void) void Xbackq(void) { + struct thread *p = runq; char wd[8193]; int c; char *s, *ewd=&wd[8192], *stop; @@ -164,7 +165,7 @@ Xbackq(void) runq->argv->words = v; v = nextv; } - runq->pc = runq->code[runq->pc].i; + p->pc = p->code[p->pc].i; return; } } -- cgit v1.2.3