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

[Timothy]

thatcher    05/11/01 09:33:40

  Modified:    .        ChangeLog
               kwq      WebCoreEncodings.mm
  Log:
          Reviewed by Dave Hyatt.
          Commited by Tim Hatcher.
  
          Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=5541
  
          HTMLNames constants are not yet initialized at Safari startup,
          when bookmarks are imported, which caused a crash in Decoder::decode().
  
          * kwq/WebCoreEncodings.mm:
          (+[WebCoreEncodings decodeData:]):
  
  Revision  Changes    Path
  1.320     +15 -1     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.319
  retrieving revision 1.320
  diff -u -r1.319 -r1.320
  --- ChangeLog	1 Nov 2005 17:21:39 -0000	1.319
  +++ ChangeLog	1 Nov 2005 17:33:36 -0000	1.320
  @@ -1,10 +1,24 @@
  +2005-11-01  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by Dave Hyatt.
  +        Commited by Tim Hatcher.
  +
  +        Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=5541
  +
  +        HTMLNames constants are not yet initialized at Safari startup,
  +        when bookmarks are imported, which caused a crash in Decoder::decode().
  +
  +        * kwq/WebCoreEncodings.mm:
  +        (+[WebCoreEncodings decodeData:]):
  +
   2005-11-01  John Sullivan  <sullivan at apple.com>
   
           Change by Alexey Proskuryakov, reviewed by Darin Adler.
   
           * kwq/KWQKURL.mm:
           (encodeRelativeString):
  -        don't use strdup, as it has problems with a curly quote in the string
  +        switched to use fastStrdup(), we can't use strdup because we
  +        need to use fastFree(), not regular free()
   
   2005-11-01  Anders Carlsson  <andersca at mac.com>
   
  
  
  
  1.8       +3 -0      WebCore/kwq/WebCoreEncodings.mm
  
  Index: WebCoreEncodings.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/WebCoreEncodings.mm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WebCoreEncodings.mm	3 Oct 2005 21:13:12 -0000	1.7
  +++ WebCoreEncodings.mm	1 Nov 2005 17:33:40 -0000	1.8
  @@ -28,10 +28,13 @@
   
   #import "decoder.h"
   
  +#include "htmlnames.h"
  +
   @implementation WebCoreEncodings
   
   + (NSString *)decodeData:(NSData *)data
   {
  +    DOM::HTMLNames::init(); // this method is used for importing bookmarks at startup, so HTMLNames are likely to be uninitialized yet
       khtml::Decoder *decoder = new khtml::Decoder();
       QString result = decoder->decode(static_cast<const char *>([data bytes]), [data length]);
       result += decoder->flush();