[webkit-changes] cvs commit: WebCore/kwq KWQObject.mm

[Adele]

adele       05/11/08 13:54:24

  Modified:    .        ChangeLog
               kwq      KWQObject.mm
  Log:
          Reviewed by Darin.
  
          - fixed <rdar://problem/4333862> REGRESSION: Crash in new JavaScript timer implementation (5661)
          http://bugzilla.opendarwin.org/show_bug.cgi?id=5661
  
          * kwq/KWQObject.mm: (sendDeferredTimerEvents): Added nil check for timers.
  
  Revision  Changes    Path
  1.347     +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.346
  retrieving revision 1.347
  diff -u -r1.346 -r1.347
  --- ChangeLog	8 Nov 2005 08:10:50 -0000	1.346
  +++ ChangeLog	8 Nov 2005 21:54:17 -0000	1.347
  @@ -1,3 +1,12 @@
  +2005-11-08  Adele Peterson  <adele at apple.com>
  +
  +        Reviewed by Darin.
  +
  +        - fixed <rdar://problem/4333862> REGRESSION: Crash in new JavaScript timer implementation (5661)
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=5661
  +
  +        * kwq/KWQObject.mm: (sendDeferredTimerEvents): Added nil check for timers.
  +
   2005-11-07  Maciej Stachowiak  <mjs at apple.com>
   
           Reviewed by Eric, Geoff and Darin.
  
  
  
  1.50      +4 -3      WebCore/kwq/KWQObject.mm
  
  Index: KWQObject.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQObject.mm,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- KWQObject.mm	7 Nov 2005 20:52:11 -0000	1.49
  +++ KWQObject.mm	8 Nov 2005 21:54:23 -0000	1.50
  @@ -247,9 +247,10 @@
       CFArrayRef timers = deferredTimers;
       deferredTimers = 0;
   
  -    CFArrayApplyFunction(timers, CFRangeMake(0, CFArrayGetCount(timers)), sendDeferredTimerEvent, 0);
  -
  -    CFRelease(timers);
  +    if (timers) {
  +        CFArrayApplyFunction(timers, CFRangeMake(0, CFArrayGetCount(timers)), sendDeferredTimerEvent, 0);
  +        CFRelease(timers);
  +    }
   }
   
   void QObject::setDefersTimers(bool defers)