Changeset 45356 in webkit for trunk/JavaScriptCore/runtime/LiteralParser.cpp

Timestamp:

Jun 29, 2009, 3:33:55 PM (16 years ago)

Author:

[email protected]

Message:

<rdar://problem/7016214> JSON.parse fails to parse valid JSON with most Unicode characters
<​https://bugs.webkit.org/show_bug.cgi?id=26802>

Reviewed by Gavin Barraclough.

In the original JSON.parse patch unicode was handled correctly, however in some last
minute "clean up" I oversimplified isSafeStringCharacter. This patch corrects this bug.

File:

• trunk/JavaScriptCore/runtime/LiteralParser.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/LiteralParser.cpp

@@ -125 +125 @@
 }
 
-static inline bool isSafeStringCharacter(UChar c)
+template <LiteralParser::ParserMode mode> static inline bool isSafeStringCharacter(UChar c)
 {
-    return (c >= ' ' && c <= 0xff && c != '\\' && c != '"') || c == '\t';
+    return (c >= ' ' && (mode == LiteralParser::StrictJSON || c <= 0xff) && c != '\\' && c != '"') || c == '\t';
 }
 
@@ -137 +137 @@
     do {
         runStart = m_ptr;
-        while (m_ptr < m_end && isSafeStringCharacter(*m_ptr))
+        while (m_ptr < m_end && isSafeStringCharacter<mode>(*m_ptr))
             ++m_ptr;
         if (runStart < m_ptr)