Changeset 1fdb0a4 for lib

Timestamp:

2010-06-05T23:26:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4aa0f6b, bc49ec2

Parents:

b308cf9 (diff), 3dc6d86 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• lib/misc.c (modified) (2 diffs)

lib/misc.c

@@ -154 +154 @@
 {
         char *start = in;
-        char *out = g_malloc( strlen( in ) + 1 );
+        char out[strlen(in)+1];
         char *s = out, *cs;
         int i, matched;
         
-        memset( out, 0, strlen( in ) + 1 );
+        memset( out, 0, sizeof( out ) );
         
         while( *in )
@@ -220 +220 @@
         
         strcpy( start, out );
-        g_free( out );
 }