From: Peter Avalos Date: Sun, 5 Feb 2012 20:26:01 +0000 (-0800) Subject: sh: Fix swapped INTON/INTOFF. X-Git-Tag: v3.4.0rc~1265 X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/97e1125af7205a348d9c853f7f73b42dd4a76d26 sh: Fix swapped INTON/INTOFF. A possible consequence of this bug was a memory leak if SIGINT arrived during a 'set' command (listing variables). Obtained-from: FreeBSD 231001 --- diff --git a/bin/sh/var.c b/bin/sh/var.c index 7d54848ea8..75657ee5a8 100644 --- a/bin/sh/var.c +++ b/bin/sh/var.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)var.c 8.3 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/var.c,v 1.64 2012/02/04 23:12:14 jilles Exp $ + * $FreeBSD: src/bin/sh/var.c,v 1.65 2012/02/04 23:29:07 jilles Exp $ */ #include @@ -600,7 +600,7 @@ showvarscmd(int argc __unused, char **argv __unused) } } - INTON; + INTOFF; vars = ckmalloc(n * sizeof(*vars)); i = 0; for (vpp = vartab; vpp < vartab + VTABSIZE; vpp++) { @@ -625,7 +625,7 @@ showvarscmd(int argc __unused, char **argv __unused) out1c('\n'); } ckfree(vars); - INTOFF; + INTON; return 0; }