[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.6.3-25-g651d212
From: |
Jim Meyering |
Subject: |
grep branch, master, updated. v2.6.3-25-g651d212 |
Date: |
Wed, 07 Apr 2010 11:39:51 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via 651d212abe771d2a32db746895ae28dd434527b6 (commit)
via 5935406996ebeec981f33de363acb0523ea367a6 (commit)
from a1fce1c4948ab2126bc71377a9d18845cd599d0e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=651d212abe771d2a32db746895ae28dd434527b6
commit 651d212abe771d2a32db746895ae28dd434527b6
Author: Jim Meyering <address@hidden>
Date: Wed Apr 7 13:36:02 2010 +0200
grep: make kwset's obstack use xmalloc, not malloc
This insidious bug could make grep fail to diagnose a failed malloc,
and then proceed to dereference the resulting NULL pointer.
Note that this bug was unlikely ever to cause real trouble; without
the fix, grep would segfault upon OOM, now it exits with a diagnostic.
* src/kwset.c (malloc) [GREP]: Define without the "(s)" macro
parameter, so that unadorned uses of malloc are also mapped to xmalloc.
One such use is in the expansion of obstack_init.
Report and patch by Nelson H. F. Beebe, in
http://thread.gmane.org/gmane.comp.gnu.grep.bugs/2995
diff --git a/src/kwset.c b/src/kwset.c
index 050562e..995be79 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -40,7 +40,7 @@
#ifdef GREP
# include "xalloc.h"
# undef malloc
-# define malloc(s) xmalloc(s)
+# define malloc xmalloc
#endif
#define NCHAR (UCHAR_MAX + 1)
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=5935406996ebeec981f33de363acb0523ea367a6
commit 651d212abe771d2a32db746895ae28dd434527b6
Author: Jim Meyering <address@hidden>
Date: Wed Apr 7 13:36:02 2010 +0200
grep: make kwset's obstack use xmalloc, not malloc
This insidious bug could make grep fail to diagnose a failed malloc,
and then proceed to dereference the resulting NULL pointer.
Note that this bug was unlikely ever to cause real trouble; without
the fix, grep would segfault upon OOM, now it exits with a diagnostic.
* src/kwset.c (malloc) [GREP]: Define without the "(s)" macro
parameter, so that unadorned uses of malloc are also mapped to xmalloc.
One such use is in the expansion of obstack_init.
Report and patch by Nelson H. F. Beebe, in
http://thread.gmane.org/gmane.comp.gnu.grep.bugs/2995
diff --git a/src/kwset.c b/src/kwset.c
index 050562e..995be79 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -40,7 +40,7 @@
#ifdef GREP
# include "xalloc.h"
# undef malloc
-# define malloc(s) xmalloc(s)
+# define malloc xmalloc
#endif
#define NCHAR (UCHAR_MAX + 1)
-----------------------------------------------------------------------
Summary of changes:
src/kwset.c | 2 +-
tests/Makefile.am | 1 +
tests/help-version | 19 +++++++++++++++----
3 files changed, 17 insertions(+), 5 deletions(-)
hooks/post-receive
--
grep
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.6.3-25-g651d212,
Jim Meyering <=