[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 58d2982d5cdf45582b567c4d616879ed5916c9d3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 20 01:03:10 2002 +0000

    	- fixed 3045651 -- null-dereference in DOM::CharacterDataImpl constructor
    	setting up text area element
    
            * khtml/xml/dom_textimpl.cpp: (CharacterDataImpl::CharacterDataImpl):
    	Set str to an empty DOMStringImpl instead of to 0. This was easier than
    	going around finding all the places that don't like a str of 0.
    
            * WebCore.pbproj/project.pbxproj: Let PB sort things as it likes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2100 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1906819..1040667 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-09-19  Darin Adler  <darin at apple.com>
+
+	- fixed 3045651 -- null-dereference in DOM::CharacterDataImpl constructor
+	setting up text area element
+
+        * khtml/xml/dom_textimpl.cpp: (CharacterDataImpl::CharacterDataImpl):
+	Set str to an empty DOMStringImpl instead of to 0. This was easier than
+	going around finding all the places that don't like a str of 0.
+
+        * WebCore.pbproj/project.pbxproj: Let PB sort things as it likes.
+
 === Alexander-24 ===
 
 2002-09-18  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1906819..1040667 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-09-19  Darin Adler  <darin at apple.com>
+
+	- fixed 3045651 -- null-dereference in DOM::CharacterDataImpl constructor
+	setting up text area element
+
+        * khtml/xml/dom_textimpl.cpp: (CharacterDataImpl::CharacterDataImpl):
+	Set str to an empty DOMStringImpl instead of to 0. This was easier than
+	going around finding all the places that don't like a str of 0.
+
+        * WebCore.pbproj/project.pbxproj: Let PB sort things as it likes.
+
 === Alexander-24 ===
 
 2002-09-18  Darin Adler  <darin at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1906819..1040667 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-09-19  Darin Adler  <darin at apple.com>
+
+	- fixed 3045651 -- null-dereference in DOM::CharacterDataImpl constructor
+	setting up text area element
+
+        * khtml/xml/dom_textimpl.cpp: (CharacterDataImpl::CharacterDataImpl):
+	Set str to an empty DOMStringImpl instead of to 0. This was easier than
+	going around finding all the places that don't like a str of 0.
+
+        * WebCore.pbproj/project.pbxproj: Let PB sort things as it likes.
+
 === Alexander-24 ===
 
 2002-09-18  Darin Adler  <darin at apple.com>
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 68e7d61..c8d4ceb 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -3943,8 +3943,8 @@
 				FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				SKIP_INSTALL = YES;
-				ppc = YES;
 				i386 = YES;
+				ppc = YES;
 			};
 			isa = PBXBuildStyle;
 			name = DeploymentFat;
diff --git a/WebCore/khtml/xml/dom_textimpl.cpp b/WebCore/khtml/xml/dom_textimpl.cpp
index 055f8e9..9843840 100644
--- a/WebCore/khtml/xml/dom_textimpl.cpp
+++ b/WebCore/khtml/xml/dom_textimpl.cpp
@@ -44,7 +44,7 @@ CharacterDataImpl::CharacterDataImpl(DocumentPtr *doc)
 CharacterDataImpl::CharacterDataImpl(DocumentPtr *doc, const DOMString &_text)
     : NodeImpl(doc)
 {
-    str = _text.impl;
+    str = _text.impl ? _text.impl : new DOMStringImpl(0, 0);
     str->ref();
 }
 

-- 
WebKit Debian packaging