Merge trunk revision 2944:

r2944 | chrissie | 2010-06-15 08:48:58 -0700 (Tue, 15 Jun 2010) | 5 lines

object_key_iter() calls object_key_iter_typed() and then always tries to
dereference the string it returns, even if the call fails. The attached
patch fixes this.



git-svn-id: http://svn.fedorahosted.org/svn/corosync/branches/flatiron@2945 fd59a12c-fef9-0310-b244-a6a79926bd2f

exec/objdb.c

@@ -1539,8 +1539,10 @@ static int object_key_iter(hdb_handle_t parent_object_handle,
 	char *str;
 	ret = object_key_iter_typed (parent_object_handle,
 		(char**)key_name, value, value_len, &t);
-	str = *key_name;
-	*key_len = strlen(str);
+	if (!ret) {
+		str = *key_name;
+		*key_len = strlen(str);
+	}
 	return ret;
 }