Changeset 1fdb0a4 for lib


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/misc.c

    rb308cf9 r1fdb0a4  
    154154{
    155155        char *start = in;
    156         char *out = g_malloc( strlen( in ) + 1 );
     156        char out[strlen(in)+1];
    157157        char *s = out, *cs;
    158158        int i, matched;
    159159       
    160         memset( out, 0, strlen( in ) + 1 );
     160        memset( out, 0, sizeof( out ) );
    161161       
    162162        while( *in )
     
    220220       
    221221        strcpy( start, out );
    222         g_free( out );
    223222}
    224223
Note: See TracChangeset for help on using the changeset viewer.