[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 693e6776dcb2029aa20492fa0775b7ab5e07d552
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 6 02:51:26 2002 +0000

    	Fix for javadoc page.  It specified an invalid unit, and our
    	unit match was on a substring, so it allowed "pts" when it
    	shouldn't.  This patch adds some code to help handle this
    	error case.
    
    	Bug # is 3119830.
    
            Reviewed by: rjw
    
            * khtml/css/cssparser.cpp:
            (StyleBaseImpl::parseUnit):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2954 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7ca0386..046c3dd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2002-12-05  David Hyatt  <hyatt at apple.com>
+
+	Fix for javadoc page.  It specified an invalid unit, and our
+	unit match was on a substring, so it allowed "pts" when it
+	shouldn't.  This patch adds some code to help handle this
+	error case.
+
+	Bug # is 3119830.
+	
+        Reviewed by: rjw
+
+        * khtml/css/cssparser.cpp:
+        (StyleBaseImpl::parseUnit):
+
 2002-12-05  Chris Blumenberg  <cblu at apple.com>
 
         Reviewed by: rjw
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7ca0386..046c3dd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2002-12-05  David Hyatt  <hyatt at apple.com>
+
+	Fix for javadoc page.  It specified an invalid unit, and our
+	unit match was on a substring, so it allowed "pts" when it
+	shouldn't.  This patch adds some code to help handle this
+	error case.
+
+	Bug # is 3119830.
+	
+        Reviewed by: rjw
+
+        * khtml/css/cssparser.cpp:
+        (StyleBaseImpl::parseUnit):
+
 2002-12-05  Chris Blumenberg  <cblu at apple.com>
 
         Reviewed by: rjw
diff --git a/WebCore/khtml/css/cssparser.cpp b/WebCore/khtml/css/cssparser.cpp
index ec38f6c..3d0db95 100644
--- a/WebCore/khtml/css/cssparser.cpp
+++ b/WebCore/khtml/css/cssparser.cpp
@@ -2706,6 +2706,11 @@ StyleBaseImpl::parseUnit(const QChar * curP, const QChar *endP, int allowedUnits
         break;
     }
 
+    // Error handling. e.g., don't treat 10pts as a valid unit.
+    split++;
+    if (split <= endP && split->latin1() != ';' && split->isLetterOrNumber())
+        return 0;
+        
     if(unit & allowedUnits)
     {
 #ifdef CSS_DEBUG

-- 
WebKit Debian packaging