From: Kamil Dudka <kdudka@redhat.com>
To: zsh-workers@zsh.org
Subject: [PATCH] queue signals while calling malloc() in the implementation of realloc()
Date: Wed, 21 Oct 2015 11:01:38 +0200 [thread overview]
Message-ID: <1445418098-24475-1-git-send-email-kdudka@redhat.com> (raw)
... also in the special case of realloc(NULL, size) where size > 0
Bug: https://bugzilla.redhat.com/1267903#c6
---
Src/mem.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Src/mem.c b/Src/mem.c
index 68bd767..9055d0a 100644
--- a/Src/mem.c
+++ b/Src/mem.c
@@ -1650,18 +1650,23 @@ zsfree(char *p)
MALLOC_RET_T
realloc(MALLOC_RET_T p, MALLOC_ARG_T size)
{
struct m_hdr *m = (struct m_hdr *)(((char *)p) - M_ISIZE), *mt;
char *r;
int i, l = 0;
/* some system..., see above */
- if (!p && size)
- return (MALLOC_RET_T) malloc(size);
+ if (!p && size) {
+ queue_signals();
+ r = malloc(size);
+ unqueue_signals();
+ return (MALLOC_RET_T) r;
+ }
+
/* and some systems even do this... */
if (!p || !size)
return (MALLOC_RET_T) p;
queue_signals(); /* just queue signals caught rather than handling them */
/* check if we are reallocating a small block, if we do, we have
to compute the size of the block from the sort of block it is in */
--
2.5.2
next reply other threads:[~2015-10-21 9:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-21 9:01 Kamil Dudka [this message]
2015-10-21 14:55 ` 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=1445418098-24475-1-git-send-email-kdudka@redhat.com \
--to=kdudka@redhat.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).