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

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:33:04 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 84af3a817f8696fe67e77fd30f4893a47c16d427
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 1 20:05:47 2003 +0000

            Reviewed by Dave.
    
    	- fixed 3213900 -- REGRESSION: crash in CSS parser at http://radioalice.com/
    
            * khtml/css/cssparser.cpp: (CSSParser::parseColor): Add a missing check for nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3989 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 717fec6..d9337ce 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2003-04-01  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+	- fixed 3213900 -- REGRESSION: crash in CSS parser at http://radioalice.com/
+
+        * khtml/css/cssparser.cpp: (CSSParser::parseColor): Add a missing check for nil.
+
+2003-04-01  Darin Adler  <darin at apple.com>
+
         Reviewed by Trey.
 
 	- fixed 3202542 -- REGRESSION: preinitialized password inputs do not show dots (affects mac.com)
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 717fec6..d9337ce 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2003-04-01  Darin Adler  <darin at apple.com>
 
+        Reviewed by Dave.
+
+	- fixed 3213900 -- REGRESSION: crash in CSS parser at http://radioalice.com/
+
+        * khtml/css/cssparser.cpp: (CSSParser::parseColor): Add a missing check for nil.
+
+2003-04-01  Darin Adler  <darin at apple.com>
+
         Reviewed by Trey.
 
 	- fixed 3202542 -- REGRESSION: preinitialized password inputs do not show dots (affects mac.com)
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 78433f4..114ee68 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -1556,6 +1556,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor()
               value->unit == CSSPrimitiveValue::CSS_DIMENSION )
 	c = ::parseColor( qString( value->string ));
     else if ( value->unit == Value::Function &&
+		value->function->args != 0 &&
 		value->function->args->numValues == 5 /* rgb + two commas */ &&
 		qString( value->function->name ).lower() == "rgb(" ) {
 	ValueList *args = value->function->args;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list