Patch #3600941: Missing field copy in Json::Value::iterator causing i…

…nfinite loop when using experimental internal map (#define JSON_VALUE_USE_INTERNAL_MAP) (contributed by Ming-Lin Kao).
hariag · Apr 12, 2013 · f92ace5 · f92ace5
1 parent 3f12417
commit f92ace5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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_;