diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:36 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:36 +0000 |
| commit | bc218bd8b5a06b381ac7a99e1301bb900076bb34 (patch) | |
| tree | cf43eb4c48540fcc93cdb1fde1536438b0ece281 /cpp/src/util/json.cc | |
| parent | c29dd2308a9beb970579e2a38ff1d02f218565a7 (diff) | |
| parent | 5074e7546d9b6344ece890f6d1a99c3fd9132272 (diff) | |
| download | src-android-m-preview.tar.gz | |
Merge from Chromium at DEPS revision db3f05efe0f9HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-m-preview-2android-m-preview-1android-m-previewub-webview-m40-releasemaster-soongmastermain
This commit was generated by merge_to_master.py.
Change-Id: I07ba5e568405463b1b643a6e88d60d6d35bba2b7
Diffstat (limited to 'cpp/src/util/json.cc')
| -rw-r--r-- | cpp/src/util/json.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/util/json.cc b/cpp/src/util/json.cc index 730479c..9d30b66 100644 --- a/cpp/src/util/json.cc +++ b/cpp/src/util/json.cc @@ -68,7 +68,7 @@ class Json::JsonImpl { assert(value != NULL); Value::ConstMemberIterator member = value_->FindMember(key.c_str()); - if (member == NULL || !member->value.IsString()) { + if (member == value_->MemberEnd() || !member->value.IsString()) { return false; } |