From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@zsh.org
Subject: Re: segmentation fault with {1..1234567}
Date: Mon, 07 Jul 2014 18:08:06 -0700 [thread overview]
Message-ID: <140707180806.ZM20805@torch.brasslantern.com> (raw)
In-Reply-To: <20140707203312.27566ab8@pws-pc.ntlworld.com>
On Jul 7, 8:33pm, Peter Stephenson wrote:
} Subject: Re: segmentation fault with {1..1234567}
}
} On Sun, 06 Jul 2014 12:46:29 -0700
} Bart Schaefer <schaefer@brasslantern.com> wrote:
} > The question is, do we fix this one instance (your patch), do we redefine
} > VARARR() [possibly conditionally] to change all the usages at once, or do
} > we individually evaluate the 50-odd uses of VARARR()?
}
} Probably the third option is the right one, but it's the most work. The
} other possibilities are the pragmatic option of only fixing things when
} they turn out to be buggy, or changing everything to heap allocation (or
} something else known not to be problematic). The best argument for the
} last one is that it removes quite a lot of variant behaviour between
} systems --- even if using zhalloc() isn't particularly efficient we can
} all see whatever effects there are and are in a better position to fix
} them (e.g. with appropriate heap manipulation commands). For that
} reason, I'm vaguely wondering if trying out that might not be a
} reasonable start.
Well, that one is easy, as I mentioned earlier; see patch below. One added
hunk in mem.c for a place where we didn't check the return of malloc, but I
did not attempt to change the usual fatal-error behavior.
diff --git a/Src/mem.c b/Src/mem.c
index a8f0c37..7e0667a 100644
--- a/Src/mem.c
+++ b/Src/mem.c
@@ -950,7 +950,10 @@ zrealloc(void *ptr, size_t size)
ptr = NULL;
} else {
/* If ptr is NULL, then behave like malloc */
- ptr = malloc(size);
+ if (!(ptr = (void *) malloc(size))) {
+ zerr("fatal error: out of memory");
+ exit(1);
+ }
}
unqueue_signals();
diff --git a/Src/zsh_system.h b/Src/zsh_system.h
index 601de69..811340d 100644
--- a/Src/zsh_system.h
+++ b/Src/zsh_system.h
@@ -286,11 +286,15 @@ struct timezone {
# include <limits.h>
#endif
+#ifdef USE_STACK_ALLOCATION
#ifdef HAVE_VARIABLE_LENGTH_ARRAYS
# define VARARR(X,Y,Z) X (Y)[Z]
#else
# define VARARR(X,Y,Z) X *(Y) = (X *) alloca(sizeof(X) * (Z))
#endif
+#else
+# define VARARR(X,Y,Z) X *(Y) = (X *) zhalloc(sizeof(X) * (Z))
+#endif
/* we should handle unlimited sizes from pathconf(_PC_PATH_MAX) */
/* but this is too much trouble */
diff --git a/configure.ac b/configure.ac
index 0f87a6c..37f3585 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,16 @@ AC_HELP_STRING([--enable-zsh-hash-debug], [turn on debugging of internal hash ta
AC_DEFINE(ZSH_HASH_DEBUG)
fi])
+dnl Do you want to dynamically allocate memory on the stack where possible?
+ifdef([stack-allocation],[undefine([stack-allocation])])dnl
+AH_TEMPLATE([USE_STACK_ALLOCATION],
+[Define to 1 if you want to allocate stack memory e.g. with `alloca'.])
+AC_ARG_ENABLE(stack-allocation,
+AC_HELP_STRING([--enable-stack-allocation], [allocate stack memory e.g. with `alloca']),
+[if test x$enableval = xyes; then
+ AC_DEFINE(USE_STACK_ALLOCATION)
+fi])
+
dnl Pathnames for global zsh scripts
ifdef([etcdir],[undefine([etcdir])])dnl
AC_ARG_ENABLE(etcdir,
next prev parent reply other threads:[~2014-07-08 1:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-04 17:25 Vincent Lefevre
2014-07-05 1:40 ` Bart Schaefer
2014-07-05 11:12 ` Vincent Lefevre
2014-07-05 16:57 ` Bart Schaefer
2014-07-05 23:39 ` Vincent Lefevre
2014-07-06 0:09 ` Vincent Lefevre
2014-07-06 19:46 ` Bart Schaefer
2014-07-07 1:12 ` Vincent Lefevre
2014-07-06 16:16 ` Bart Schaefer
2014-07-06 18:30 ` Peter Stephenson
2014-07-06 19:46 ` Bart Schaefer
2014-07-06 22:23 ` Mikael Magnusson
2014-07-07 19:33 ` Peter Stephenson
2014-07-08 1:08 ` Bart Schaefer [this message]
2014-07-08 10:38 ` Peter Stephenson
2014-07-24 9:44 ` Peter Stephenson
2014-07-24 15:35 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=140707180806.ZM20805@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).