* src/sort.c (insertkey): Use xmemdup, rather than xmalloc+assignment.

From Paul Eggert.

diff --git a/ChangeLog b/ChangeLog
index e737ee1739d28d0cf337edc86d1f677626659526..c4e225296c7bad2053423b8da70e1c8e41630ab2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-11-13  Jim Meyering  <jim@meyering.net>
 
+       * src/sort.c (insertkey): Use xmemdup, rather than xmalloc+assignment.
+       From Paul Eggert.
+
        Plug another technically-unimportant leak in sort.
        * src/sort.c (main): Don't allocate memory for each new key here.
        (insertkey): Allocate memory for each key here, instead.

diff --git a/src/sort.c b/src/sort.c
index bdaf032a3c3915b78ba7ec4b75003d13ebefc0f4..feaf5a5bc141cd39ff2ab5e8f29ff5034f5380b7 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -2105,9 +2105,8 @@ static void
 insertkey (struct keyfield *key_arg)
 {
   struct keyfield **p;
-  struct keyfield *key = xmalloc (sizeof *key);
+  struct keyfield *key = xmemdup (key_arg, sizeof *key);
 
-  *key = *key_arg;
   for (p = &keylist; *p; p = &(*p)->next)
     continue;
   *p = key;