[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 16:58:52
Message-ID: 1247677132.769976.7626.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 997261 by tmcguire:

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

........
  r990023 | winterz | 2009-07-01 15:24:56 +0200 (Wed, 01 Jul 2009) | 5 lines
  
  backport SVN commit 990021 by winterz:
  
  Avod generating recurrent events until everything crashes.
  Inspired by a patch from Alvaro, Thanks!
........


 _M            . (directory)  
 M  +2 -0      kcal/recurrencerule.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158
   + /branches/KDE/4.3/kdepimlibs:1-986158,990023
--- branches/kdepim/enterprise4/kdepimlibs/kcal/recurrencerule.cpp #997260:997261
@@ -1693,6 +1693,8 @@
     KDateTime dt = start.addSecs( d->mTimedRepetition - n );
     if ( dt < enddt ) {
       n = static_cast<int>( ( dt.secsTo_long( enddt ) - 1 ) / d->mTimedRepetition ) + 1;
+      // limit n by a sane value else we can "explode".
+      n = qMin( n, LOOP_LIMIT );
       for ( int i = 0;  i < n;  dt = dt.addSecs( d->mTimedRepetition ), ++i ) {
         result += dt;
       }
[prev in list] [next in list] [prev in thread] [next in thread]