Changeset 67ebc8e for lib/json_util.h

Timestamp:

2012-11-12T00:03:33Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

aef2077

Parents:

e132b60

Message:

Fixed valgrind warnings in JSON_O_FOREACH.

File:

• lib/json_util.h (modified) (1 diff)

lib/json_util.h

@@ -26 +26 @@
 #define JSON_O_FOREACH(o, k, v) \
         char *k; json_value *v; int __i; \
-        for( __i = 0; k = (o)->u.object.values[__i].name, \
-                      v = (o)->u.object.values[__i].value, \
-                      __i < (o)->u.object.length; __i ++ )
+        for( __i = 0; ( __i < (o)->u.object.length ) && \
+                      ( k = (o)->u.object.values[__i].name ) && \
+                      ( v = (o)->u.object.values[__i].value ); \
+                      __i ++ )
 
 json_value *json_o_get( const json_value *obj, const json_char *name );