From f92ace5e82c4f5bb2158a617770e140701074345 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Fri, 12 Apr 2013 13:26:23 +0000 Subject: [PATCH] Patch #3600941: Missing field copy in Json::Value::iterator causing infinite loop when using experimental internal map (#define JSON_VALUE_USE_INTERNAL_MAP) (contributed by Ming-Lin Kao). --- NEWS.txt | 3 +++ src/lib_json/json_valueiterator.inl | 1 + 2 files changed, 4 insertions(+) diff --git a/NEWS.txt b/NEWS.txt index 39ed9ab..f09c71e 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -35,6 +35,9 @@ New in SVN - Patch #3539678: Copy constructor does not initialize allocated_ for stringValue (contributed by rmongia). + - Patch #3600941: Missing field copy in Json::Value::iterator causing infinite + loop when using experimental internal map (#define JSON_VALUE_USE_INTERNAL_MAP) + (contributed by Ming-Lin Kao). New in JsonCpp 0.6.0: diff --git a/src/lib_json/json_valueiterator.inl b/src/lib_json/json_valueiterator.inl index 7457ca3..9b85580 100644 --- a/src/lib_json/json_valueiterator.inl +++ b/src/lib_json/json_valueiterator.inl @@ -149,6 +149,7 @@ ValueIteratorBase::copy( const SelfType &other ) { #ifndef JSON_VALUE_USE_INTERNAL_MAP current_ = other.current_; + isNull_ = other.isNull_; #else if ( isArray_ ) iterator_.array_ = other.iterator_.array_;