Prepare for RapidJSON FindMember() API change.

Currently, ConstMemberIterator is implemented as a pointer and
FindMember() returns NULL to signal not found. But ConstMemberIterator
is going to be changed to a non-pointer type and the return value for
not found will then be changed to MemberEnd().

To make this code work for both cases, the return value is first
compared to a newly created empty ConstMemberIterator (ie. NULL, when
ConstMemberIterator is implemented as a pointer) and then compared to
MemberEnd().

1 files changed, 2 insertions, 1 deletions

diff --git a/cpp/src/util/json.cc b/cpp/src/util/json.cc
index 730479c..46d830a 100644
--- a/cpp/src/util/json.cc
+++ b/cpp/src/util/json.cc
@@ -68,7 +68,8 @@ class Json::JsonImpl {
     assert(value != NULL);
 
     Value::ConstMemberIterator member = value_->FindMember(key.c_str());
-    if (member == NULL || !member->value.IsString()) {
+    if (member == Value::ConstMemberIterator() ||
+        member == value_->MemberEnd() || !member->value.IsString()) {
       return false;
     }