- touch ~/Applications/addressbook/addressbook.xml lead to a Crash on XML

loading. Don't assume that the Child of the first element is present

1 files changed, 1 insertions, 1 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 00d62ee..18113c2 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -507,193 +507,193 @@ bool OPimContactAccessBackend_XML::remove ( int uid )
     } else
         return false;
 }
 
 bool OPimContactAccessBackend_XML::reload(){
     /* Reload is the same as load in this implementation */
     return ( load() );
 }
 
 void OPimContactAccessBackend_XML::addContact_p( const OPimContact &newcontact )
 {
     OPimContact* contRef = new OPimContact( newcontact );
 
     m_contactList.append ( contRef );
     m_uidToContact.insert( QString().setNum( newcontact.uid() ), contRef );
 }
 
 /* This function loads the xml-database and the journalfile */
 bool OPimContactAccessBackend_XML::load( const QString filename, bool isJournal )
 {
 
     /* We use the time of the last read to check if the file was
      * changed externally.
      */
     if ( !isJournal ){
         QFileInfo fi( filename );
         m_readtime = fi.lastModified ();
     }
 
     const int JOURNALACTION = Qtopia::Notes + 1;
     const int JOURNALROW = JOURNALACTION + 1;
 
     bool foundAction = false;
     journal_action action = ACTION_ADD;
     int journalKey = 0;
     QMap<int, QString> contactMap;
     QMap<QString, QString> customMap;
     QMap<QString, QString>::Iterator customIt;
     QAsciiDict<int> dict( 47 );
 
     dict.setAutoDelete( TRUE );
     dict.insert( "Uid", new int(Qtopia::AddressUid) );
     dict.insert( "Title", new int(Qtopia::Title) );
     dict.insert( "FirstName", new int(Qtopia::FirstName) );
     dict.insert( "MiddleName", new int(Qtopia::MiddleName) );
     dict.insert( "LastName", new int(Qtopia::LastName) );
     dict.insert( "Suffix", new int(Qtopia::Suffix) );
     dict.insert( "FileAs", new int(Qtopia::FileAs) );
     dict.insert( "Categories", new int(Qtopia::AddressCategory) );
     dict.insert( "DefaultEmail", new int(Qtopia::DefaultEmail) );
     dict.insert( "Emails", new int(Qtopia::Emails) );
     dict.insert( "HomeStreet", new int(Qtopia::HomeStreet) );
     dict.insert( "HomeCity", new int(Qtopia::HomeCity) );
     dict.insert( "HomeState", new int(Qtopia::HomeState) );
     dict.insert( "HomeZip", new int(Qtopia::HomeZip) );
     dict.insert( "HomeCountry", new int(Qtopia::HomeCountry) );
     dict.insert( "HomePhone", new int(Qtopia::HomePhone) );
     dict.insert( "HomeFax", new int(Qtopia::HomeFax) );
     dict.insert( "HomeMobile", new int(Qtopia::HomeMobile) );
     dict.insert( "HomeWebPage", new int(Qtopia::HomeWebPage) );
     dict.insert( "Company", new int(Qtopia::Company) );
     dict.insert( "BusinessStreet", new int(Qtopia::BusinessStreet) );
     dict.insert( "BusinessCity", new int(Qtopia::BusinessCity) );
     dict.insert( "BusinessState", new int(Qtopia::BusinessState) );
     dict.insert( "BusinessZip", new int(Qtopia::BusinessZip) );
     dict.insert( "BusinessCountry", new int(Qtopia::BusinessCountry) );
     dict.insert( "BusinessWebPage", new int(Qtopia::BusinessWebPage) );
     dict.insert( "JobTitle", new int(Qtopia::JobTitle) );
     dict.insert( "Department", new int(Qtopia::Department) );
     dict.insert( "Office", new int(Qtopia::Office) );
     dict.insert( "BusinessPhone", new int(Qtopia::BusinessPhone) );
     dict.insert( "BusinessFax", new int(Qtopia::BusinessFax) );
     dict.insert( "BusinessMobile", new int(Qtopia::BusinessMobile) );
     dict.insert( "BusinessPager", new int(Qtopia::BusinessPager) );
     dict.insert( "Profession", new int(Qtopia::Profession) );
     dict.insert( "Assistant", new int(Qtopia::Assistant) );
     dict.insert( "Manager", new int(Qtopia::Manager) );
     dict.insert( "Spouse", new int(Qtopia::Spouse) );
     dict.insert( "Children", new int(Qtopia::Children) );
     dict.insert( "Gender", new int(Qtopia::Gender) );
     dict.insert( "Birthday", new int(Qtopia::Birthday) );
     dict.insert( "Anniversary", new int(Qtopia::Anniversary) );
     dict.insert( "Nickname", new int(Qtopia::Nickname) );
     dict.insert( "Notes", new int(Qtopia::Notes) );
     dict.insert( "action", new int(JOURNALACTION) );
     dict.insert( "actionrow", new int(JOURNALROW) );
 
     //owarn << "OPimContactDefaultBackEnd::loading " << filename << "" << oendl;
 
     XMLElement *root = XMLElement::load( filename );
     if(root != 0l ){ // start parsing
         /* Parse all XML-Elements and put the data into the
          * Contact-Class
          */
         XMLElement *element = root->firstChild();
         //owarn << "OPimContactAccess::load tagName(): " << root->tagName() << "" << oendl;
-        element = element->firstChild();
+        element = element ? element->firstChild() : 0;
 
         /* Search Tag "Contacts" which is the parent of all Contacts */
         while( element && !isJournal ){
             if( element->tagName() != QString::fromLatin1("Contacts") ){
                 //owarn << "OPimContactDefBack::Searching for Tag \"Contacts\"! Found: "
                 //      << element->tagName() << oendl;
                 element = element->nextChild();
             } else {
                 element = element->firstChild();
                 break;
             }
         }
         /* Parse all Contacts and ignore unknown tags */
         while( element ){
             if( element->tagName() != QString::fromLatin1("Contact") ){
                 //owarn << "OPimContactDefBack::Searching for Tag \"Contact\"! Found: "
                 //      << element->tagName() << oendl;
                 element = element->nextChild();
                 continue;
             }
             /* Found alement with tagname "contact", now parse and store all
              * attributes contained
              */
             //owarn << "OPimContactDefBack::load element tagName() : "
             //      << element->tagName() << oendl;
             QString dummy;
             foundAction = false;
 
             XMLElement::AttributeMap aMap = element->attributes();
             XMLElement::AttributeMap::Iterator it;
             contactMap.clear();
             customMap.clear();
             for( it = aMap.begin(); it != aMap.end(); ++it ){
                 // owarn << "Read Attribute: " << it.key() << "=" << it.data() << oendl;
 
                 int *find = dict[ it.key() ];
                 /* Unknown attributes will be stored as "Custom" elements */
                 if ( !find ) {
                     // owarn << "Attribute " << it.key() << " not known." << oendl;
                     //contact.setCustomField(it.key(), it.data());
                     customMap.insert( it.key(),  it.data() );
                     continue;
                 }
 
                 /* Check if special conversion is needed and add attribute
                  * into Contact class
                  */
                 switch( *find ) {
                     /*
                       case Qtopia::AddressUid:
                       contact.setUid( it.data().toInt() );
                       break;
                       case Qtopia::AddressCategory:
                       contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
                       break;
                     */
                 case JOURNALACTION:
                     action = journal_action(it.data().toInt());
                     foundAction = true;
                     owarn << "ODefBack(journal)::ACTION found: " << action << oendl;
                     break;
                 case JOURNALROW:
                     journalKey = it.data().toInt();
                     break;
                 default: // no conversion needed add them to the map
                     contactMap.insert( *find, it.data() );
                     break;
                 }
             }
             /* now generate the Contact contact */
             OPimContact contact( contactMap );
 
             for (customIt = customMap.begin(); customIt != customMap.end(); ++customIt ) {
                 contact.setCustomField( customIt.key(),  customIt.data() );
             }
 
             if (foundAction){
                 foundAction = false;
                 switch ( action ) {
                 case ACTION_ADD:
                     addContact_p (contact);
                     break;
                 case ACTION_REMOVE:
                     if ( !remove (contact.uid()) )
                         owarn << "ODefBack(journal)::Unable to remove uid: " << contact.uid() << oendl;
                     break;
                 case ACTION_REPLACE:
                     if ( !replace ( contact ) )
                         owarn << "ODefBack(journal)::Unable to replace uid: " << contact.uid() << oendl;
                     break;
                 default:
                     owarn << "Unknown action: ignored !" << oendl;
                     break;
                 }
             }else{
                 /* Add contact to list */