merge the fix for that segfault

This commit is contained in:
tg 2008-04-20 01:41:57 +00:00
parent 8c41fbed15
commit 5fb55148a1

7
sh.h

@ -8,7 +8,7 @@
/* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */
/* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */ /* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */
#define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.209 2008/04/20 00:24:26 tg Exp $" #define MKSH_SH_H_ID "$MirOS: src/bin/mksh/sh.h,v 1.210 2008/04/20 01:41:57 tg Exp $"
#define MKSH_VERSION "R33 2008/04/20" #define MKSH_VERSION "R33 2008/04/20"
#if HAVE_SYS_PARAM_H #if HAVE_SYS_PARAM_H
@ -1207,8 +1207,9 @@ void *alloc(size_t, Area *);
void *aresize(void *, size_t, Area *); void *aresize(void *, size_t, Area *);
void afree(void *, Area *); void afree(void *, Area *);
#define afreechk(s) do { \ #define afreechk(s) do { \
if (s) \ void *afree_t = (s); \
afree(s, ATEMP); \ if (afree_t) \
afree(afree_t, ATEMP); \
} while (0) } while (0)
#define afreechv(v,s) do { \ #define afreechv(v,s) do { \
if (v) \ if (v) \