Fix double free

[claws.git] / src / ldif.c

diff --git a/src/ldif.c b/src/ldif.c
index 7c446b9b76f3f63b1a2c231d0f1094fae1dd296e..46b95bea228c95bece8cde589328977fdddf488e 100644 (file)
--- a/src/ldif.c
+++ b/src/ldif.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2009 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@
 #include "addritem.h"
 #include "addrcache.h"
 
-#include "base64.h"
 #include "utils.h"
 
 #define        LDIF_SEP_TAG    ':'
@@ -63,7 +62,7 @@ LdifFile *ldif_create() {
  * \param value    Value of access flag.
  */
 void ldif_set_file( LdifFile *ldifFile, const gchar *value ) {
-       g_return_if_fail( ldifFile != NULL );
+       cm_return_if_fail( ldifFile != NULL );
 
        if( ldifFile->path ) {
                if( strcmp( ldifFile->path, value ) != 0 )
@@ -83,7 +82,7 @@ void ldif_set_file( LdifFile *ldifFile, const gchar *value ) {
  * \param value    File specification.
  */
 void ldif_set_accessed( LdifFile *ldifFile, const gboolean value ) {
-       g_return_if_fail( ldifFile != NULL );
+       cm_return_if_fail( ldifFile != NULL );
        ldifFile->accessFlag = value;
 }
 
@@ -123,7 +122,7 @@ static void ldif_free_fieldrec( Ldif_FieldRec *rec ) {
  *              named.
  */
 void ldif_field_set_name( Ldif_FieldRec *rec, const gchar *value ) {
-       g_return_if_fail( rec != NULL );
+       cm_return_if_fail( rec != NULL );
 
        if( ! rec->reserved ) {
                rec->userName = mgu_replace_string( rec->userName, value );
@@ -138,7 +137,7 @@ void ldif_field_set_name( Ldif_FieldRec *rec, const gchar *value ) {
  *              fields cannot be unselected.
  */
 void ldif_field_set_selected( Ldif_FieldRec *rec, const gboolean value ) {
-       g_return_if_fail( rec != NULL );
+       cm_return_if_fail( rec != NULL );
 
        if( ! rec->reserved ) {
                rec->selected = value;
@@ -151,7 +150,7 @@ void ldif_field_set_selected( Ldif_FieldRec *rec, const gboolean value ) {
  * \param rec   LDIF field object.
  */
 void ldif_field_toggle( Ldif_FieldRec *rec ) {
-       g_return_if_fail( rec != NULL );
+       cm_return_if_fail( rec != NULL );
 
        if( ! rec->reserved ) {
                rec->selected = !rec->selected;
@@ -167,8 +166,6 @@ void ldif_field_toggle( Ldif_FieldRec *rec ) {
 */
 static gint ldif_hash_free_vis( gpointer key, gpointer value, gpointer data ) {
        ldif_free_fieldrec( ( Ldif_FieldRec * ) value );
-       value = NULL;
-       key = NULL;
        return -1;
 }
 
@@ -177,7 +174,7 @@ static gint ldif_hash_free_vis( gpointer key, gpointer value, gpointer data ) {
  * \param ldifFile LDIF import control object.
  */
 void ldif_free( LdifFile *ldifFile ) {
-       g_return_if_fail( ldifFile != NULL );
+       cm_return_if_fail( ldifFile != NULL );
 
        /* Close file */
        if( ldifFile->file ) fclose( ldifFile->file );
@@ -234,7 +231,7 @@ static gint ldif_open_file( LdifFile* ldifFile ) {
  * \param  ldifFile LDIF import control object.
  */
 static void ldif_close_file( LdifFile *ldifFile ) {
-       g_return_if_fail( ldifFile != NULL );
+       cm_return_if_fail( ldifFile != NULL );
        if( ldifFile->file ) fclose( ldifFile->file );
        ldifFile->file = NULL;
 }
@@ -250,8 +247,10 @@ static gchar *ldif_get_line( LdifFile *ldifFile ) {
        int i = 0;
        int cur_alloc = LDIFBUFSIZE;
 
-       if( feof( ldifFile->file ) ) 
+       if( feof( ldifFile->file ) ) {
+               g_free(buf);
                return NULL;
+       }
 
        while( i < cur_alloc-1 ) {
                ch = fgetc( ldifFile->file );
@@ -293,7 +292,7 @@ static gchar *ldif_get_tagname( char* line, gboolean *flag64 ) {
        gchar *tag = NULL;
        gchar *lptr = line;
        gchar *sptr = NULL;
-       gchar *down = NULL;
+       
        while( *lptr++ ) {
                /* Check for language tag */
                if( *lptr == LDIF_LANG_TAG ) {
@@ -314,9 +313,7 @@ static gchar *ldif_get_tagname( char* line, gboolean *flag64 ) {
 
                        tag = g_strndup( line, len+1 );
                        tag[ len ] = '\0';
-                       down = g_utf8_strdown( tag, -1 );
-                       g_free(tag);
-                       return down;
+                        return tag;
                }
        }
        return tag;
@@ -526,8 +523,7 @@ static void ldif_add_value(
 {
        gchar *nm, *val;
 
-       nm = g_strdup( tagName );
-       g_utf8_strdown( nm, -1 );
+       nm = g_utf8_strdown( tagName, -1 );
        if( tagValue ) {
                val = g_strdup( tagValue );
        }
@@ -536,19 +532,19 @@ static void ldif_add_value(
        }
        g_strstrip( val );
 
-       if( g_utf8_collate( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
+       if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_COMMONNAME, -1 ) ) == 0 ) {
                rec->listCName = g_slist_append( rec->listCName, val );
        }
-       else if( g_utf8_collate( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
+       else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_FIRSTNAME, -1 ) ) == 0 ) {
                rec->listFName = g_slist_append( rec->listFName, val );
        }
-       else if( g_utf8_collate( nm, LDIF_TAG_LASTNAME ) == 0 ) {
+       else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_LASTNAME, -1 ) ) == 0 ) {
                rec->listLName = g_slist_append( rec->listLName, val );
        }
-       else if( g_utf8_collate( nm, LDIF_TAG_NICKNAME ) == 0 ) {
+       else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_NICKNAME, -1 ) ) == 0 ) {
                rec->listNName = g_slist_append( rec->listNName, val );
        }
-       else if( g_utf8_collate( nm, LDIF_TAG_EMAIL ) == 0 ) {
+       else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_EMAIL, -1 ) ) == 0 ) {
                rec->listAddress = g_slist_append( rec->listAddress, val );
        }
        else {
@@ -611,6 +607,8 @@ static void ldif_read_file( LdifFile *ldifFile, AddressCache *cache ) {
        long posEnd = 0L;
        long posCur = 0L;
        GHashTable *hashField;
+       gchar *out;
+       gsize len;
 
        hashField = ldifFile->hashFields;
        rec = g_new0( Ldif_ParsedRec, 1 );
@@ -644,22 +642,9 @@ static void ldif_read_file( LdifFile *ldifFile, AddressCache *cache ) {
                                /* Save record */
                                fullValue = mgu_list_coalesce( listValue );
                                if (fullValue && last64) {
-                                       gchar *out = g_malloc(strlen(fullValue));
-                                       int len = 0;
-                                       if ((len = base64_decode(out, fullValue,
-                                                       strlen(fullValue))) >= 0) {
-                                               g_free(fullValue);
-                                               fullValue = out;
-                                               fullValue[len] = '\0';
-                                       } else
-                                               g_free(out);
-                               }
-                               /* Base-64 encoded data */
-                               /*
-                               if( last64 ) {
-                                       ldif_dump_b64( fullValue );
+                                       g_free(fullValue);
+                                       fullValue = g_base64_decode(fullValue, &len);
                                }
-                               */
 
                                ldif_add_value( rec, lastTag, fullValue, hashField );
                                /* ldif_print_record( rec, stdout ); */
@@ -667,6 +652,7 @@ static void ldif_read_file( LdifFile *ldifFile, AddressCache *cache ) {
                                ldif_clear_rec( rec );
                                g_free( lastTag );
                                mgu_free_list( listValue );
+                               g_free(fullValue);
                                lastTag = NULL;
                                listValue = NULL;
                                last64 = FALSE;
@@ -695,10 +681,8 @@ static void ldif_read_file( LdifFile *ldifFile, AddressCache *cache ) {
                                                        fullValue =
                                                                mgu_list_coalesce( listValue );
                                                        if (fullValue && last64) {
-                                                               gchar *out = g_malloc(strlen(fullValue));
-                                                               int len = 0;
-                                                               if ((len = base64_decode(out, fullValue,
-                                                                               strlen(fullValue))) >= 0) {
+                                                               out = g_base64_decode(fullValue, &len);
+                                                               if (len >= 0) {
                                                                        g_free(fullValue);
                                                                        fullValue = out;
                                                                        fullValue[len] = '\0';
@@ -719,7 +703,6 @@ static void ldif_read_file( LdifFile *ldifFile, AddressCache *cache ) {
                                                        mgu_free_list( listValue );
                                                        lastTag = NULL;
                                                        listValue = NULL;
-                                                       last64 = FALSE;
                                                }
 
                                                lastTag = g_strdup( tagName );
@@ -756,30 +739,30 @@ static void ldif_hash_add_list( GHashTable *table, GSList *list ) {
                gchar *tag = node->data;
                if( ! g_hash_table_lookup( table, tag ) ) {
                        Ldif_FieldRec *rec = NULL;
-                       gchar *key = g_strdup( tag );
+                       gchar *key = g_utf8_strdown( tag, -1 );
 
                        rec = ldif_create_fieldrec( tag );
-                       if( g_utf8_collate( tag, LDIF_TAG_DN ) == 0 ) {
+                       if( g_utf8_collate( key, LDIF_TAG_DN ) == 0 ) {
                                rec->reserved = rec->selected = TRUE;
                                rec->userName = g_strdup( "dn" );
                        }
-                       else if( g_utf8_collate( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
+                       else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_COMMONNAME, -1 ) ) == 0 ) {
                                rec->reserved = rec->selected = TRUE;
                                rec->userName = g_strdup( _( "Display Name" ) );
                        }
-                       else if( g_utf8_collate( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
+                       else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_FIRSTNAME, -1 ) ) == 0 ) {
                                rec->reserved = rec->selected = TRUE;
                                rec->userName = g_strdup( _( "First Name" ) );
                        }
-                       else if( g_utf8_collate( tag, LDIF_TAG_LASTNAME ) == 0 ) {
+                       else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_LASTNAME, -1 ) ) == 0 ) {
                                rec->reserved = rec->selected = TRUE;
                                rec->userName = g_strdup( _( "Last Name" ) );
                        }
-                       else if( g_utf8_collate( tag, LDIF_TAG_NICKNAME ) == 0 ) {
+                       else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_NICKNAME, -1 ) ) == 0 ) {
                                rec->reserved = rec->selected = TRUE;
                                rec->userName = g_strdup( _( "Nick Name" ) );
                        }
-                       else if( g_utf8_collate( tag, LDIF_TAG_EMAIL ) == 0 ) {
+                       else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_EMAIL, -1 ) ) == 0 ) {
                                rec->reserved = rec->selected = TRUE;
                                rec->userName = g_strdup( _( "Email Address" ) );
                        }
@@ -923,7 +906,7 @@ static void ldif_read_tag_list( LdifFile *ldifFile ) {
  * \return Status code.
  */
 gint ldif_import_data( LdifFile *ldifFile, AddressCache *cache ) {
-       g_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
+       cm_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
        ldifFile->retVal = MGU_SUCCESS;
        addrcache_clear( cache );
        cache->dataRead = FALSE;
@@ -947,7 +930,7 @@ gint ldif_import_data( LdifFile *ldifFile, AddressCache *cache ) {
  * \return Status code.
  */
 gint ldif_read_tags( LdifFile *ldifFile ) {
-       g_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
+       cm_return_val_if_fail( ldifFile != NULL, MGU_BAD_ARGS );
        ldifFile->retVal = MGU_SUCCESS;
        if( ldifFile->dirtyFlag ) {
                ldif_open_file( ldifFile );
@@ -973,7 +956,7 @@ gint ldif_read_tags( LdifFile *ldifFile ) {
 GList *ldif_get_fieldlist( LdifFile *ldifFile ) {
        GList *list = NULL;
 
-       g_return_val_if_fail( ldifFile != NULL, NULL );
+       cm_return_val_if_fail( ldifFile != NULL, NULL );
        if( ldifFile->hashFields ) {
                ldifFile->tempList = NULL;
                g_hash_table_foreach( ldifFile->hashFields, ldif_hash2list_vis, ldifFile );