summaryrefslogtreecommitdiffstats
path: root/base/json_reader.cc
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-01 17:26:06 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-01 17:26:06 +0000
commitd46d6f3b80099ce0c630185a2e86b649bba49254 (patch)
tree3467712dd0265f76edf1ae0fcc6da131670bad74 /base/json_reader.cc
parentf89a6233760f8ca8033265046ed9ea38bbc20bf9 (diff)
downloadchromium_src-d46d6f3b80099ce0c630185a2e86b649bba49254.zip
chromium_src-d46d6f3b80099ce0c630185a2e86b649bba49254.tar.gz
chromium_src-d46d6f3b80099ce0c630185a2e86b649bba49254.tar.bz2
Fixes bug where JSON reader errored on reading vertical tabs (\v). The
writer properly escapes a vertical tab, but the readed instead errored on the vertical this. This resulted in lost bookmarks:( BUG=3031 TEST=covered by unit tests Review URL: http://codereview.chromium.org/5628 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2759 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json_reader.cc')
-rw-r--r--base/json_reader.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/base/json_reader.cc b/base/json_reader.cc
index 8d0cab4..c0e019b 100644
--- a/base/json_reader.cc
+++ b/base/json_reader.cc
@@ -361,6 +361,7 @@ JSONReader::Token JSONReader::ParseStringToken() {
case 'n':
case 'r':
case 't':
+ case 'v':
case '"':
break;
default:
@@ -406,6 +407,9 @@ bool JSONReader::DecodeString(const Token& token, Value** node) {
case 't':
decoded_str.push_back('\t');
break;
+ case 'v':
+ decoded_str.push_back('\v');
+ break;
case 'x':
decoded_str.push_back((HexToInt(*(token.begin + i + 1)) << 4) +