Attachment 151307 Details for Bug 234633 – Patch for kjs

[patch] Patch for kjs

kdelibs-kjs.diff (text/plain), 1.31 KB, created by Josh Bressers on 2007-03-30 18:29:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2007-03-30 18:29:07 UTC

Size: 1.31 KB

patch

obsolete

>------------------------------------------------------------------------
>r645387 | porten | 2007-03-22 15:01:13 +0100 (Thu, 22 Mar 2007) | 4 lines
>
>substitute some of the invalid sequences with the standard replacement
>char. this matches Mozilla but not IE which leaves them unchanged (or
>throws an exception)
>
>------------------------------------------------------------------------
>--- kjs/function.cpp
>+++ kjs/function.cpp
>@@ -244,11 +244,15 @@ UString decodeURI(ExecState *exec, UStri
>       }
> 
>       // UTF-8 transform
>+      const unsigned long replacementChar = 0xFFFD;
>       unsigned long V;
>       if (n == 2) {
> 	unsigned long yyyyy = octets[0] & 0x1F;
> 	unsigned long zzzzzz = octets[1] & 0x3F;
> 	V = (yyyyy << 6) | zzzzzz;
>+	// 2-byte sequence overlong for this value?
>+	if (V < 0xFF)
>+	  V = replacementChar;
> 	C = UChar((unsigned short)V);
>       }
>       else if (n == 3) {
>@@ -256,6 +260,11 @@ UString decodeURI(ExecState *exec, UStri
> 	unsigned long yyyyyy = octets[1] & 0x3F;
> 	unsigned long zzzzzz = octets[2] & 0x3F;
> 	V = (xxxx << 12) | (yyyyyy << 6) | zzzzzz;
>+	// 3-byte sequence overlong for this value,
>+	// an invalid value or UTF-16 surrogate?
>+	if (V < 0x800 || V == 0xFFFE || V == 0xFFFF ||
>+	    (V >= 0xD800 && V <= 0xDFFF))
>+	  V = replacementChar;
> 	C = UChar((unsigned short)V);
>       }
>       else {

Actions: View | Diff

Attachments on bug 234633: 151307 | 151310 | 151312