[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-07-15 17:13:25
Message-ID: 1247678005.808264.9768.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 997266 by tmcguire:

Merged revisions 990631 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r990631 | winterz | 2009-07-02 22:58:32 +0200 (Thu, 02 Jul 2009) | 8 lines
  
  backport SVN commit 990626 by winterz:
  
  handle the case where there is no VERSION property.
  Based on Alvaro's patch.
  
  (extra, unnecessary i18n strings removed)
........


 _M            . (directory)  
 M  +6 -1      kcal/icalformat_p.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575
   + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631
--- branches/kdepim/enterprise4/kdepimlibs/kcal/icalformat_p.cpp #997265:997266
@@ -2375,7 +2375,12 @@
     return false;
   } else {
     const char *version = icalproperty_get_version( p );
-
+    if ( !version ) {
+      kDebug() << "No VERSION property found";
+      d->mParent->setException( new ErrorFormat(
+                                  ErrorFormat::CalVersionUnknown ) );
+      return false;
+    }
     if ( strcmp( version, "1.0" ) == 0 ) {
       kDebug() << "Expected iCalendar, got vCalendar";
       d->mParent->setException(
[prev in list] [next in list] [prev in thread] [next in thread]