( cvs diff -u -r 1.382.2.360 -r 1.382.2.361 src/compose.c; ) > 2.7.2cvs68.patchset
( cvs diff -u -r 1.207.2.149 -r 1.207.2.150 src/folderview.c; cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/imap_gtk.c; ) > 2.7.2cvs69.patchset
( cvs diff -u -r 1.115.2.138 -r 1.115.2.139 src/main.c; cvs diff -u -r 1.7.2.9 -r 1.7.2.10 src/main.h; cvs diff -u -r 1.14.2.51 -r 1.14.2.52 src/plugins/trayicon/trayicon.c; ) > 2.7.2cvs70.patchset
+( cvs diff -u -r 1.60.2.82 -r 1.60.2.83 src/addressbook.c; ) > 2.7.2cvs71.patchset
FolderInfo *fi;
FolderPathMatch *nextmatch = NULL;
+ if (!parentFolder)
+ return;
+
list = parentFolder->listFolder;
while ( list ) {
folder = list->data;
fi = addressbook_peek_subfolder_exists_create_folderinfo( fiParent->book, folder );
addressbook_peek_subfolder_exists_load_folder( folder, fi, nextmatch );
+ g_free(fi);
list = g_list_next( list );
}
}
list = addrindex_get_interface_list( _addressIndex_ );
while ( list && !folder_path_match.matched ) {
AddressInterface *interface = list->data;
- if ( interface->type == ADDR_IF_BOOK ) {
+ if ( interface && interface->type == ADDR_IF_BOOK ) {
nodeDS = interface->listSource;
while ( nodeDS && !folder_path_match.matched ) {
ds = nodeDS->data;
abf = ds->rawDataSource;
/* match book name */
- if ( strcmp(folder_path_match.folder_path[0], abf->fileName) == 0 ) {
+ if ( abf && abf->fileName &&
+ strcmp(folder_path_match.folder_path[0], abf->fileName) == 0 ) {
debug_print("matched book name '%s'\n", abf->fileName);
folder_path_match.book = ds;
folder_path_match.index = 1;
/* this call will set folder_path_match.matched and folder_path_match.folder */
addressbook_peek_subfolder_exists_load_folder( rootFolder, fi, &folder_path_match );
+ g_free(fi);
}
}