[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

andersca at apple.com andersca at apple.com
Wed Dec 22 15:48:07 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 7260e540ae9eb158f6cebf2760ff580b70b44f35
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 17:59:47 2010 +0000

    CString(const char*) crashes when passed a null pointer
    https://bugs.webkit.org/show_bug.cgi?id=49450
    
    Reviewed by Adam Roben.
    
    * wtf/text/CString.cpp:
    (WTF::CString::CString):
    Return early if str is null.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71923 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7f922c0..120a2fd 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-12  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
+        CString(const char*) crashes when passed a null pointer
+        https://bugs.webkit.org/show_bug.cgi?id=49450
+
+        * wtf/text/CString.cpp:
+        (WTF::CString::CString):
+        Return early if str is null.
+
 2010-11-11  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/wtf/text/CString.cpp b/JavaScriptCore/wtf/text/CString.cpp
index c048a1b..2b78bf8 100644
--- a/JavaScriptCore/wtf/text/CString.cpp
+++ b/JavaScriptCore/wtf/text/CString.cpp
@@ -33,6 +33,9 @@ namespace WTF {
 
 CString::CString(const char* str)
 {
+    if (!str)
+        return;
+
     init(str, strlen(str));
 }
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list