- Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=7735

        REGRESSION: crash on importing bookmarks

        No test - only reproducible when Safari imports the bookmarks.

        * dom/EventNames.cpp:
        (WebCore::EventNames::init): Initialize AtomicString before using it.
        * dom/QualifiedName.cpp:
        (WebCore::QualifiedName::init): Ditto.
        * khtml/html/htmlnames.cpp:
        (WebCore::HTMLNames::init): Ditto.
        * ksvg2/scripts/make_names.pl: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13264 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 965c9989e017d2ba656d66888984fb5bc18df261..5f81cadee7e4752f606b24d58a52b487fbbd8113 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2006-03-13  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Maciej.
+
+        - Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=7735
+        REGRESSION: crash on importing bookmarks
+
+        No test - only reproducible when Safari imports the bookmarks.
+
+        * dom/EventNames.cpp:
+        (WebCore::EventNames::init): Initialize AtomicString before using it.
+        * dom/QualifiedName.cpp:
+        (WebCore::QualifiedName::init): Ditto.
+        * khtml/html/htmlnames.cpp:
+        (WebCore::HTMLNames::init): Ditto.
+        * ksvg2/scripts/make_names.pl: Ditto.
+
 2006-03-12  David Kilzer  <ddkilzer@kilzer.net>
 
         Reviewed by Darin, landed by ap.

diff --git a/WebCore/dom/EventNames.cpp b/WebCore/dom/EventNames.cpp
index a732e0299d1f9ea72ea5b8e8ef51882924dc3afa..85970251fa95cdfb4a8a24ee64e7d8586cf34ace 100644 (file)
--- a/WebCore/dom/EventNames.cpp
+++ b/WebCore/dom/EventNames.cpp
@@ -43,6 +43,8 @@ void init()
     static bool initialized;
     if (!initialized) {
         // Use placement new to initialize the globals.
+        
+        AtomicString::init();
         #define INITIALIZE_GLOBAL(name) new ((void*)&name##Event) AtomicString(#name);
         DOM_EVENT_NAMES_FOR_EACH(INITIALIZE_GLOBAL)
         initialized = true;

diff --git a/WebCore/dom/QualifiedName.cpp b/WebCore/dom/QualifiedName.cpp
index fc4bdabb9cf2dc2692641f2de2b2f7811d97e5ad..f7a058102228891e0a035c70b90367c9fad847df 100644 (file)
--- a/WebCore/dom/QualifiedName.cpp
+++ b/WebCore/dom/QualifiedName.cpp
@@ -179,6 +179,8 @@ void QualifiedName::init()
     static bool initialized;
     if (!initialized) {
         // Use placement new to initialize the globals.
+        
+        AtomicString::init();
         new ((void*)&anyName) QualifiedName(nullAtom, starAtom, starAtom);
         initialized = true;
     }

diff --git a/WebCore/khtml/html/htmlnames.cpp b/WebCore/khtml/html/htmlnames.cpp
index b5e5b0e9ef69163d672036215aec41832059d953..551ba2301d8a6210ef04f4bd65ffaff16819b88f 100644 (file)
--- a/WebCore/khtml/html/htmlnames.cpp
+++ b/WebCore/khtml/html/htmlnames.cpp
@@ -49,6 +49,7 @@ void init()
     if (!initialized) {
         // Use placement new to initialize the globals.
 
+        AtomicString::init();
         AtomicString xhtmlNS("http://www.w3.org/1999/xhtml");
 
         // Namespace

diff --git a/WebCore/ksvg2/scripts/make_names.pl b/WebCore/ksvg2/scripts/make_names.pl
index b3e6480eab1a92c7931626096036f6a8d6b81418..f534103832f35822cad08036b042ce783829a8e9 100755 (executable)
--- a/WebCore/ksvg2/scripts/make_names.pl
+++ b/WebCore/ksvg2/scripts/make_names.pl
@@ -279,6 +279,8 @@ print "void init()
     initialized = true;
     
     // Use placement new to initialize the globals.
+    
+    AtomicString::init();
 ";
        
     print("    AtomicString ${lowerNamespace}NS(\"$namespaceURI\");\n\n");