X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Fcommon%2Fparam-validation%2Fparam-validation.c;h=ca80e888add31aa156ae4bbcec2c3730bb46d3d7;hp=bdca9f9a35a1cf5239146768553712b973f45943;hb=a96b15ad316cf7613d47a5652817382d4774ee4e;hpb=6091410a4ecbd389501c7fc977d2e30eb432f07f

diff --git a/src/plugins/common/param-validation/param-validation.c b/src/plugins/common/param-validation/param-validation.c
index bdca9f9a..ca80e888 100644
--- a/src/plugins/common/param-validation/param-validation.c
+++ b/src/plugins/common/param-validation/param-validation.c
@@ -159,19 +159,21 @@ bt_bool validate_map_value_entry(const char *key,
 		const bt_value *value, void *v_data)
 {
 	struct validate_map_value_data *data = v_data;
-	const struct bt_param_validation_map_value_entry_descr *candidate;
+	const struct bt_param_validation_map_value_entry_descr *entry = NULL;
 	guint i;
 
 	/* Check if this key is in the available keys. */
 	for (i = 0; i < data->available_keys->len; i++) {
-		candidate = g_ptr_array_index(data->available_keys, i);
+		const struct bt_param_validation_map_value_entry_descr *candidate =
+			g_ptr_array_index(data->available_keys, i);
 
 		if (g_str_equal(key, candidate->key)) {
+			entry = candidate;
 			break;
 		}
 	}
 
-	if (i < data->available_keys->len) {
+	if (entry) {
 		/* Key was found in available keys. */
 		g_ptr_array_remove_index_fast(data->available_keys, i);
 
@@ -179,7 +181,7 @@ bt_bool validate_map_value_entry(const char *key,
 		validate_ctx_push_map_scope(data->ctx, key);
 
 		/* Validate the value of the entry. */
-		data->status = validate_value(value, &candidate->value_descr,
+		data->status = validate_value(value, &entry->value_descr,
 			data->ctx);
 
 		validate_ctx_pop_scope(data->ctx);