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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit bff43aee6a5c547537cb7be349e550a85f1c807d
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 4 00:39:28 2003 +0000

    	Fix for 3185852, crash when dynamically inserting rules because
    	of an unitialized parser variable.
    
            Reviewed by darin
    
            * khtml/css/css_ruleimpl.cpp:
            (CSSMediaRuleImpl::insertRule):
            * khtml/css/css_stylesheetimpl.cpp:
            (CSSStyleSheetImpl::insertRule):
            * khtml/css/cssparser.cpp:
            (CSSParser::parseRule):
            * khtml/css/cssparser.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6eb9f68..ffc0bcb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,20 @@
 2003-03-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3185852, crash when dynamically inserting rules because
+	of an unitialized parser variable.
+	
+        Reviewed by darin
+
+        * khtml/css/css_ruleimpl.cpp:
+        (CSSMediaRuleImpl::insertRule):
+        * khtml/css/css_stylesheetimpl.cpp:
+        (CSSStyleSheetImpl::insertRule):
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseRule):
+        * khtml/css/cssparser.h:
+
+2003-03-03  David Hyatt  <hyatt at apple.com>
+
 	Clean up dynamic ID/CLASS setting/removal.  Make ID actually
 	work when set dynamically.  Fixes bug 3173050.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6eb9f68..ffc0bcb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,20 @@
 2003-03-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3185852, crash when dynamically inserting rules because
+	of an unitialized parser variable.
+	
+        Reviewed by darin
+
+        * khtml/css/css_ruleimpl.cpp:
+        (CSSMediaRuleImpl::insertRule):
+        * khtml/css/css_stylesheetimpl.cpp:
+        (CSSStyleSheetImpl::insertRule):
+        * khtml/css/cssparser.cpp:
+        (CSSParser::parseRule):
+        * khtml/css/cssparser.h:
+
+2003-03-03  David Hyatt  <hyatt at apple.com>
+
 	Clean up dynamic ID/CLASS setting/removal.  Make ID actually
 	work when set dynamically.  Fixes bug 3173050.
 	
diff --git a/WebCore/khtml/css/css_ruleimpl.cpp b/WebCore/khtml/css/css_ruleimpl.cpp
index d8031df..6194fa1 100644
--- a/WebCore/khtml/css/css_ruleimpl.cpp
+++ b/WebCore/khtml/css/css_ruleimpl.cpp
@@ -238,7 +238,7 @@ unsigned long CSSMediaRuleImpl::insertRule( const DOMString &rule,
                                             unsigned long index )
 {
     CSSParser p( strictParsing );
-    CSSRuleImpl *newRule = p.parseRule( rule );
+    CSSRuleImpl *newRule = p.parseRule( parentStyleSheet(), rule );
 
     return newRule ? m_lstCSSRules->insertRule( newRule, index ) : 0;
 }
diff --git a/WebCore/khtml/css/css_stylesheetimpl.cpp b/WebCore/khtml/css/css_stylesheetimpl.cpp
index be2506d..6cb9c84 100644
--- a/WebCore/khtml/css/css_stylesheetimpl.cpp
+++ b/WebCore/khtml/css/css_stylesheetimpl.cpp
@@ -166,7 +166,7 @@ unsigned long CSSStyleSheetImpl::insertRule( const DOMString &rule, unsigned lon
         return 0;
     }
     CSSParser p( strictParsing );
-    CSSRuleImpl *r = p.parseRule( rule );
+    CSSRuleImpl *r = p.parseRule( this, rule );
 
     if(!r) {
         exceptioncode = CSSException::SYNTAX_ERR + CSSException::_EXCEPTION_OFFSET;
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index 55e8de9..160aa88 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -155,8 +155,10 @@ void CSSParser::parseSheet( CSSStyleSheetImpl *sheet, const DOMString &string )
     rule = 0;
 }
 
-CSSRuleImpl *CSSParser::parseRule( const DOM::DOMString &string )
+CSSRuleImpl *CSSParser::parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOMString &string )
 {
+    styleElement = sheet;
+    
     const char konq_rule[] = "@-konq-rule{";
     int length = string.length() + 4 + strlen(konq_rule);
     data = (unsigned short *)malloc( length *sizeof( unsigned short ) );
diff --git a/WebCore/khtml/css/cssparser.h b/WebCore/khtml/css/cssparser.h
index 0f46efa..2d05168 100644
--- a/WebCore/khtml/css/cssparser.h
+++ b/WebCore/khtml/css/cssparser.h
@@ -97,7 +97,7 @@ namespace DOM {
 	~CSSParser();
 
 	void parseSheet( DOM::CSSStyleSheetImpl *sheet, const DOM::DOMString &string );
-	DOM::CSSRuleImpl *parseRule( const DOM::DOMString &string );
+	DOM::CSSRuleImpl *parseRule( DOM::CSSStyleSheetImpl *sheet, const DOM::DOMString &string );
 	bool parseValue( DOM::CSSStyleDeclarationImpl *decls, int id, const DOM::DOMString &string,
 			 bool _important, bool _nonCSSHint );
 	bool parseDeclaration( DOM::CSSStyleDeclarationImpl *decls, const DOM::DOMString &string,

-- 
WebKit Debian packaging