From 0781ecb087b027cccc1c44de1a1c7520cc89e2d2 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 30 Jan 2013 09:11:18 +0100 Subject: [PATCH] Fix a bug with Unicode surrogates in decodeURI Change-Id: Id8348c77ad4d5429c4b4116b8ef0dc94e130c4e3 Reviewed-by: Simon Hausmann --- qv4globalobject.cpp | 2 +- tests/TestExpectations | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qv4globalobject.cpp b/qv4globalobject.cpp index d538cfd..74cd32d 100644 --- a/qv4globalobject.cpp +++ b/qv4globalobject.cpp @@ -283,8 +283,8 @@ static QString decode(const QString &input, const QString &reservedSet, bool *ok ushort l = ushort(((uc - 0x10000) & 0x3FF) + 0xDC00); ushort h = ushort((((uc - 0x10000) >> 10) & 0x3FF) + 0xD800); - output.append(QChar(l)); output.append(QChar(h)); + output.append(QChar(l)); } } else { QChar z(b); diff --git a/tests/TestExpectations b/tests/TestExpectations index 265d083..39ace8b 100644 --- a/tests/TestExpectations +++ b/tests/TestExpectations @@ -1,7 +1,3 @@ -# Skipped because of slow string concatenation, test takes a looong time to execute. -S15.1.3.1_A2.5_T1 -S15.1.3.2_A2.5_T1 - # wrong tests # uses octal number 15.2.3.6-2-17-1 failing @@ -57,4 +53,4 @@ Sbp_A4_T2 failing S12.4_A1 failing S15.2.4.4_A14 failing # Try/catch scoping issue -S12.14_A4 failing \ No newline at end of file +S12.14_A4 failing -- 2.7.4