[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 ae913b2cbe60b3f552a4809e0c78a61d1db345d7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 8 15:21:41 2003 +0000

            Reviewed by John Sullivan.
    
            - fixed 3366234 -- repro crash in CSS parser: function that can't be parsed (www.bi-flugplatz-magdeburg.de)
    
            * khtml/css/parser.y: Allocate a Function object for the "can't parse function" case, since
            the other code involved cannot handle 0 for the function.
            * khtml/css/parser.cpp: Regenerated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index cb7058e..e008bb8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-08-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by John Sullivan.
+
+        - fixed 3366234 -- repro crash in CSS parser: function that can't be parsed (www.bi-flugplatz-magdeburg.de)
+
+        * khtml/css/parser.y: Allocate a Function object for the "can't parse function" case, since
+        the other code involved cannot handle 0 for the function.
+        * khtml/css/parser.cpp: Regenerated.
+
 === Safari-92 ===
 
 2003-08-07  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cb7058e..e008bb8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-08-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by John Sullivan.
+
+        - fixed 3366234 -- repro crash in CSS parser: function that can't be parsed (www.bi-flugplatz-magdeburg.de)
+
+        * khtml/css/parser.y: Allocate a Function object for the "can't parse function" case, since
+        the other code involved cannot handle 0 for the function.
+        * khtml/css/parser.cpp: Regenerated.
+
 === Safari-92 ===
 
 2003-08-07  Ken Kocienda  <kocienda at apple.com>
diff --git a/WebCore/khtml/css/parser.cpp b/WebCore/khtml/css/parser.cpp
index f229849..bc6f706 100644
--- a/WebCore/khtml/css/parser.cpp
+++ b/WebCore/khtml/css/parser.cpp
@@ -308,7 +308,7 @@ static const short yyrline[] = { 0,
    875,   877,   878,   879,   886,   887,   888,   889,   890,   891,
    893,   898,   900,   901,   902,   903,   904,   905,   906,   907,
    908,   909,   910,   911,   912,   913,   914,   915,   916,   920,
-   928,   940,   947,   954,   962,   988,   990,   993,   995
+   928,   943,   950,   957,   965,   991,   993,   996,   998
 };
 #endif
 
@@ -1987,17 +1987,20 @@ case 140:
 case 141:
 #line 929 "parser.y"
 {
+      Function *f = new Function;
+      f->name = yyvsp[-2].string;
+      f->args = 0;
       yyval.value.id = 0;
       yyval.value.unit = Value::Function;
-      yyval.value.function = 0;
+      yyval.value.function = f;
   ;
     break;}
 case 142:
-#line 941 "parser.y"
+#line 944 "parser.y"
 { yyval.string = yyvsp[-1].string; ;
     break;}
 case 143:
-#line 948 "parser.y"
+#line 951 "parser.y"
 {
 	yyval.rule = 0;
 #ifdef CSS_DEBUG
@@ -2006,7 +2009,7 @@ case 143:
     ;
     break;}
 case 144:
-#line 954 "parser.y"
+#line 957 "parser.y"
 {
 	yyval.rule = 0;
 #ifdef CSS_DEBUG
@@ -2015,7 +2018,7 @@ case 144:
     ;
     break;}
 case 145:
-#line 963 "parser.y"
+#line 966 "parser.y"
 {
 	yyval.rule = 0;
 #ifdef CSS_DEBUG
@@ -2245,6 +2248,6 @@ yyerrhandle:
     }
   return 1;
 }
-#line 998 "parser.y"
+#line 1001 "parser.y"
 
 
diff --git a/WebCore/khtml/css/parser.y b/WebCore/khtml/css/parser.y
index a07775e..a711d6b 100644
--- a/WebCore/khtml/css/parser.y
+++ b/WebCore/khtml/css/parser.y
@@ -927,9 +927,12 @@ function:
       $$.function = f;
   } |
   FUNCTION maybe_space error {
+      Function *f = new Function;
+      f->name = $1;
+      f->args = 0;
       $$.id = 0;
       $$.unit = Value::Function;
-      $$.function = 0;
+      $$.function = f;
   }
   ;
 /*

-- 
WebKit Debian packaging