Tille ask Diana how she was able to trigger that bug?

I nominate her for the bug finding queen 2002.
Ok I just fixed two possible crashes with the risk of losing
data.

1 files changed, 17 insertions, 8 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index e9e6a0b..3fa1a7c 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -553,24 +553,26 @@ void AbTable::load( const QString &fn )
 
 void AbTable::loadFile( const QString &strFile, bool journalFile )
 {
 //     QTime t;
 //     t.start();
     QFile f( strFile );
     if ( !f.open(IO_ReadOnly) )
 	return;
     QList<Contact> list;
     list.setAutoDelete( TRUE );
     QByteArray ba = f.readAll();
     f.close();
+   if (ba.isEmpty() )
+       return;
     char *uc = ba.data();//(QChar *)data.unicode();
     int len = ba.size();//data.length();
     bool foundAction = false;
     Contact::journal_action action;
     bool foundKey = false;
     int journalKey = 0;
 
     const int JOURNALACTION = Qtopia::Notes + 1;
     const int JOURNALROW = JOURNALACTION + 1;
 
     // **********************************
     // CHANGE THE SIZE OF THE DICT IF YOU ADD ANY MORE FIELDS!!!!
@@ -788,35 +790,42 @@ void AbTable::internalAddEntries( QList<Contact> &list )
     Contact *it;
     for ( it = list.first(); it; it = list.next() )
 	insertIntoTable( *it, row++ );
     resort();
     setUpdatesEnabled( TRUE );
 }
 
 
 void AbTable::journalFreeReplace( const Contact &cnt, int row )
 {
     QString strName,
 	strContact;
-    AbTableItem *ati;
+    AbTableItem *ati = 0l;
 
     strName = findContactName( cnt );
     strContact = findContactContact( cnt );
     ati = static_cast<AbTableItem*>(item(row, 0));
-    contactList.remove( ati );
-    ati->setItem( strName, strContact );
-    contactList.insert( ati, cnt );
-
-    ati = static_cast<AbTableItem*>(item(row, 1));
-    ati->setItem( strContact, strName );
+    if ( ati != 0 ) {
+        contactList.remove( ati );
+        ati->setItem( strName, strContact );
+        contactList.insert( ati, cnt );
+
+        ati = static_cast<AbTableItem*>(item(row, 1));
+        ati->setItem( strContact, strName );
+    }else{
+        int myrows = numRows();
+        setNumRows( myrows + 1 );
+        insertIntoTable( cnt, myrows );
+        // gets deleted when returning
+    }
 }
 
 void AbTable::journalFreeRemove( int row )
 {
     AbTableItem *ati;
     ati = static_cast<AbTableItem*>(item(row, 0));
     if ( !ati )
 	return;
     contactList.remove( ati );
     realignTable( row );
 }
 
@@ -1074,25 +1083,25 @@ void AbTable::updateVisible()
 		}
 	    }
 	}
 	if ( showChar != '\0' ) {
 	    tmpStr = fileAsName.left(1);
 	    tmpStr = tmpStr.lower();
 	    if ( tmpStr != QString(QChar(showChar)) && showChar != '#' ) {
 		    hide = true;
 	    }
 	    if ( showChar == '#' ) {
 		    if (tmpStr == "a")
 			    hide = true;
-		    
+
 		    if (tmpStr == "b")
 			    hide = true;
 
 		    if (tmpStr == "c")
 			    hide = true;
 
 		    if (tmpStr == "d")
 			    hide = true;
 
 		    if (tmpStr == "e")
 			    hide = true;