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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 526d75b43d07fe28191d5b37fd7457cd9d3876a4
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 25 09:15:45 2002 +0000

    	- fixed 3048031 - innerHTML is incorrectly null
    
            * kwq/KWQString.mm:
            (QString::isNull): Check for NULL by comparing to
    	shared_null_handle instead of checking for 0 length, so
    	garden-variety empty strings don't show as NULL.
            (QString::QString): Make sure that string created with a NULL char
    	* uses the shared null handle, so it's properly NULL.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2463 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ed12f0f..f99ccdc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-10-25  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3048031 - innerHTML is incorrectly null
+	
+        * kwq/KWQString.mm:
+        (QString::isNull): Check for NULL by comparing to
+	shared_null_handle instead of checking for 0 length, so
+	garden-variety empty strings don't show as NULL.
+        (QString::QString): Make sure that string created with a NULL char
+	* uses the shared null handle, so it's properly NULL.
+
 2002-10-24  Richard Williamson   <rjw at apple.com>
 
         Updated to reflect new calling parameter semantic of floatCharacterWidths(),
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ed12f0f..f99ccdc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-10-25  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3048031 - innerHTML is incorrectly null
+	
+        * kwq/KWQString.mm:
+        (QString::isNull): Check for NULL by comparing to
+	shared_null_handle instead of checking for 0 length, so
+	garden-variety empty strings don't show as NULL.
+        (QString::QString): Make sure that string created with a NULL char
+	* uses the shared null handle, so it's properly NULL.
+
 2002-10-24  Richard Williamson   <rjw at apple.com>
 
         Updated to reflect new calling parameter semantic of floatCharacterWidths(),
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ed12f0f..f99ccdc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-10-25  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3048031 - innerHTML is incorrectly null
+	
+        * kwq/KWQString.mm:
+        (QString::isNull): Check for NULL by comparing to
+	shared_null_handle instead of checking for 0 length, so
+	garden-variety empty strings don't show as NULL.
+        (QString::QString): Make sure that string created with a NULL char
+	* uses the shared null handle, so it's properly NULL.
+
 2002-10-24  Richard Williamson   <rjw at apple.com>
 
         Updated to reflect new calling parameter semantic of floatCharacterWidths(),
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 42fffec..15de854 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -942,13 +942,16 @@ QString::QString(const char *chs)
 #ifdef QSTRING_DEBUG_ALLOCATIONS
     countInstance (&dataHandle);
 #endif
-    dataHandle = (QStringData **)allocateHandle();
-    *dataHandle = &internalData;
 
-    if (chs)
+    if (chs) {
         internalData.initialize(chs,strlen(chs));
-    else
-        internalData.initialize();
+	dataHandle = (QStringData **)allocateHandle();
+	*dataHandle = &internalData;
+    } else {
+	internalData.deref();
+	dataHandle = makeSharedNullHandle();
+	dataHandle[0]->ref();
+    }
 }
 
 QString::QString(const char *chs, int len)
@@ -1110,7 +1113,7 @@ QCString QString::local8Bit() const
 
 bool QString::isNull() const
 {
-    return dataHandle[0]->_length == 0;
+    return dataHandle == shared_null_handle;
 }
 
 int QString::find(QChar qc, int index) const

-- 
WebKit Debian packaging