CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-04 15:49:42 +02:00
Code Issues Projects Releases Wiki Activity

Plug another technically-unimportant leak in sort.

Browse Source 
* src/sort.c (main): Don't allocate memory for each new key here.
(insertkey): Allocate memory for each key here, instead.
(key_init): Rename from new_key.  Don't allocate.
This commit is contained in:
Jim Meyering
2006-11-13 15:19:22 +01:00
parent d5d00c7f9f
commit 2061f04847
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+5
View File
@@ -1,5 +1,10 @@
2006-11-13 Jim Meyering <jim@meyering.net>
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.
(key_init): Rename from new_key. Don't allocate.
* src/sort.c (main): Plug a tiny memory leak.
Move declaration of local "minus" down to be nearer point of use.
src/sort.c
+9 -6
View File
@@ -2099,13 +2099,15 @@ sort (char * const *files, size_t nfiles, char const *output_file)
}
}
/* Insert key KEY at the end of the key list. */
/* Insert a malloc'd copy of key KEY_ARG at the end of the key list. */
static void
insertkey (struct keyfield *key)
insertkey (struct keyfield *key_arg)
{
struct keyfield **p;
struct keyfield *key = xmalloc (sizeof *key);
*key = *key_arg;
for (p = &keylist; *p; p = &(*p)->next)
continue;
*p = key;
@@ -2271,9 +2273,9 @@ set_ordering (const char *s, struct keyfield *key, enum blanktype blanktype)
}
static struct keyfield *
new_key (void)
key_init (struct keyfield *key)
{
struct keyfield *key = xzalloc (sizeof *key);
memset (key, 0, sizeof *key);
key->eword = SIZE_MAX;
return key;
}
@@ -2282,6 +2284,7 @@ int
main (int argc, char **argv)
{
struct keyfield *key;
struct keyfield key_buf;
struct keyfield gkey;
char const *s;
int c = 0;
@@ -2408,7 +2411,7 @@ main (int argc, char **argv)
{
/* Treat +POS1 [-POS2] as a key if possible; but silently
treat an operand as a file if it is not a valid +POS1. */
key = new_key ();
key = key_init (&key_buf);
s = parse_field_count (optarg + 1, &key->sword, NULL);
if (s && *s == '.')
s = parse_field_count (s + 1, &key->schar, NULL);
@@ -2463,7 +2466,7 @@ main (int argc, char **argv)
break;
case 'k':
key = new_key ();
key = key_init (&key_buf);
/* Get POS1. */
s = parse_field_count (optarg, &key->sword,