summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2007-07-20 16:29:06 +0200
committerJim Meyering <jim@meyering.net>2007-07-20 16:29:06 +0200
commit0cf61819479ad43533b6e24d769a8e85c7a17f11 (patch)
tree1e268070d55b9b6b6adb2f8a75b550214b3015de
parent1f2c2d70538f6cdff2ac1bfeb20191b9bf82b5f8 (diff)
downloadcoreutils-0cf61819479ad43533b6e24d769a8e85c7a17f11.tar.xz
* src/sort.c (main): Don't free a pointer to non-malloc'd memory.
-rw-r--r--ChangeLog4
-rw-r--r--src/sort.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d6e2e05ba..ee8167672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-20 Andreas Schwab <schwab@suse.de>
+
+ * src/sort.c (main): Don't free a pointer to non-malloc'd memory.
+
2007-07-19 Jim Meyering <jim@meyering.net>
Fix a portability bug in the new ls-color test.
diff --git a/src/sort.c b/src/sort.c
index 29a3c1805..824dd0d23 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -2874,10 +2874,7 @@ main (int argc, char **argv)
if (! (key->sword | key->schar))
key->sword = SIZE_MAX;
if (! s || *set_ordering (s, key, bl_start))
- {
- free (key);
- key = NULL;
- }
+ key = NULL;
else
{
if (minus_pos_usage)