[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 d6dc467cf76f8721ce92a4be0f42396d41ae9c92
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Apr 25 15:10:32 2004 +0000

            Reviewed by Dave.
    
            * kjs/ustring.cpp: (KJS::UString::append): Fix one case that was allocating a buffer
            that is 2x too big.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 106187e..4e526f8 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        * kjs/ustring.cpp: (KJS::UString::append): Fix one case that was allocating a buffer
+        that is 2x too big.
+
 2004-04-23  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/JavaScriptCore/kjs/ustring.cpp b/JavaScriptCore/kjs/ustring.cpp
index 4f1ab6a..a605583 100644
--- a/JavaScriptCore/kjs/ustring.cpp
+++ b/JavaScriptCore/kjs/ustring.cpp
@@ -621,7 +621,7 @@ UString &UString::append(const UString &t)
     rep = newRep;
   } else {
     // this is shared with someone using more capacity, gotta make a whole new string
-    int newCapacity = expandedSize(sizeof(UChar) * length, 0);
+    int newCapacity = expandedSize(length, 0);
     UChar *d = static_cast<UChar *>(malloc(sizeof(UChar) * newCapacity));
     memcpy(d, data(), thisSize * sizeof(UChar));
     memcpy(const_cast<UChar *>(d + thisSize), t.data(), tSize * sizeof(UChar));

-- 
WebKit Debian packaging