From b514fbe110f548df45f1de6064c1ac2a4037b917 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Tue, 19 Nov 2013 08:30:10 -0800 Subject: 32023: better interrupt handling at RM_STAR_WAIT --- Src/utils.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Src/utils.c') diff --git a/Src/utils.c b/Src/utils.c index d1d9406c2..0db9c30a6 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2299,6 +2299,8 @@ checkrmall(char *s) sleep(10); fputc('\n', shout); } + if (errflag) + return 0; fputs(" [yn]? ", shout); fflush(shout); zbeep(); -- cgit v1.2.3 From 561811602059a9b948be636710b45662174d1a6a Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Wed, 27 Nov 2013 22:09:48 -0800 Subject: 32061: Fix "use of uninitialized memory" in metafy --- ChangeLog | 4 ++++ Src/utils.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'Src/utils.c') diff --git a/ChangeLog b/ChangeLog index b4719ec91..f0ff5b109 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-27 Barton E. Schaefer + + * 32061: Src/utils.c: Fix "use of uninitialized memory" in metafy + 2013-11-27 Peter Stephenson * unposted, see 32054 and thread: diff --git a/Src/utils.c b/Src/utils.c index 0db9c30a6..c6d178ce2 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3985,7 +3985,7 @@ metafy(char *buf, int len, int heap) if (imeta(*e++)) meta++; - if (meta || heap == META_DUP || heap == META_HEAPDUP || *e != '\0') { + if (meta || heap == META_DUP || heap == META_HEAPDUP) { switch (heap) { case META_REALLOC: buf = zrealloc(buf, len + meta + 1); @@ -4028,8 +4028,8 @@ metafy(char *buf, int len, int heap) meta--; } } - *e = '\0'; } + *e = '\0'; return buf; } -- cgit v1.2.3