Commit 4d6ba8d5 authored by Johannes Henkel's avatar Johannes Henkel Committed by Commit Bot

[DevTools] Roll inspector_protocol (Chromium)

New revision: 8ec18cf0885bef0b5c2a922c5dc3813cbf63e962

Change-Id: I49b072bb7922647b5cb24d439671ff760be70a63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1617648Reviewed-by: default avatarAlexei Filippov <alph@chromium.org>
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661139}
parent b9815a6b
...@@ -2,7 +2,7 @@ Name: inspector protocol ...@@ -2,7 +2,7 @@ Name: inspector protocol
Short Name: inspector_protocol Short Name: inspector_protocol
URL: https://chromium.googlesource.com/deps/inspector_protocol/ URL: https://chromium.googlesource.com/deps/inspector_protocol/
Version: 0 Version: 0
Revision: 0aafd2876f7485db7b07c513c0457b7cbbbe3304 Revision: 8ec18cf0885bef0b5c2a922c5dc3813cbf63e962
License: BSD License: BSD
License File: LICENSE License File: LICENSE
Security Critical: yes Security Critical: yes
......
...@@ -178,7 +178,12 @@ std::unique_ptr<DictionaryValue> parseMap( ...@@ -178,7 +178,12 @@ std::unique_ptr<DictionaryValue> parseMap(
key = StringUtil::fromUTF8(key_span.data(), key_span.size()); key = StringUtil::fromUTF8(key_span.data(), key_span.size());
tokenizer->Next(); tokenizer->Next();
} else if (tokenizer->TokenTag() == cbor::CBORTokenTag::STRING16) { } else if (tokenizer->TokenTag() == cbor::CBORTokenTag::STRING16) {
return nullptr; // STRING16 not supported yet. span<uint8_t> key_span = tokenizer->GetString16WireRep();
if (key_span.size() & 1) return nullptr; // UTF16 is 2 byte multiple.
key = StringUtil::fromUTF16(
reinterpret_cast<const uint16_t*>(key_span.data()),
key_span.size() / 2);
tokenizer->Next();
} else { } else {
// Error::CBOR_INVALID_MAP_KEY // Error::CBOR_INVALID_MAP_KEY
return nullptr; return nullptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment