[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 3461b385e2459c7f5c0e2cb1fdfec791d4c0ce94
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 8 20:22:01 2004 +0000

    	Fix for 3721453, CSS3 initial property caused crashes because the macros were not written correctly.
    
            Reviewed by john
    
            * khtml/css/cssstyleselector.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6976 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e1cb507..b969d39 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2004-07-08  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3721453, CSS3 initial property caused crashes because the macros were not written correctly.
+	
+        Reviewed by john
+
+        * khtml/css/cssstyleselector.cpp:
+
 === Safari-151 ===
 
 2004-07-07  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/khtml/css/cssstyleselector.cpp b/WebCore/khtml/css/cssstyleselector.cpp
index 7e23f12..f688578 100644
--- a/WebCore/khtml/css/cssstyleselector.cpp
+++ b/WebCore/khtml/css/cssstyleselector.cpp
@@ -79,12 +79,18 @@ if (isInherit) \
 #define HANDLE_INHERIT_AND_INITIAL(prop, Prop) \
 HANDLE_INHERIT(prop, Prop) \
 else if (isInitial) \
-    style->set##Prop(RenderStyle::initial##Prop());
+{\
+    style->set##Prop(RenderStyle::initial##Prop());\
+    return;\
+}
 
 #define HANDLE_INHERIT_AND_INITIAL_WITH_VALUE(prop, Prop, Value) \
 HANDLE_INHERIT(prop, Prop) \
 else if (isInitial) \
-    style->set##Prop(RenderStyle::initial##Value());
+{\
+    style->set##Prop(RenderStyle::initial##Value());\
+    return;\
+}
 
 #define HANDLE_INHERIT_COND(propID, prop, Prop) \
 if (id == propID) \

-- 
WebKit Debian packaging