[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[sullivan at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4d25586ec02b8fbbfcb91ef1ce260b381e08f855
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 9 20:06:17 2010 +0000

    https://bugs.webkit.org/show_bug.cgi?id=34772
    Overzealous new assertion in URStringImpl::adopt()
    
    Reviewed by Adam Barth.
    
    * runtime/UStringImpl.h:
    (JSC::UStringImpl::adopt):
    Only assert that vector.data() is non-zero if vector.size() is non-zero.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54563 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index dc3a7ed..553350c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-09  John Sullivan  <sullivan at apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=34772
+        Overzealous new assertion in URStringImpl::adopt()
+
+        Reviewed by Adam Barth.
+
+        * runtime/UStringImpl.h:
+        (JSC::UStringImpl::adopt):
+        Only assert that vector.data() is non-zero if vector.size() is non-zero.
+
 2010-02-09  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Not reviewed. Try to fix build problem on SnowLeopard slaves to bring them back.
diff --git a/JavaScriptCore/runtime/UStringImpl.h b/JavaScriptCore/runtime/UStringImpl.h
index 6010ba6..bbea0aa 100644
--- a/JavaScriptCore/runtime/UStringImpl.h
+++ b/JavaScriptCore/runtime/UStringImpl.h
@@ -87,9 +87,10 @@ public:
     template<size_t inlineCapacity>
     static PassRefPtr<UStringImpl> adopt(Vector<UChar, inlineCapacity>& vector)
     {
-        ASSERT(vector.data());
-        if (unsigned length = vector.size())
+        if (unsigned length = vector.size()) {
+            ASSERT(vector.data());
             return adoptRef(new UStringImpl(vector.releaseBuffer(), length, BufferOwned));
+        }
         return &empty();
     }
 

-- 
WebKit Debian packaging