X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fcommon%2Fparam-validation%2Fparam-validation.c;h=bdca9f9a35a1cf5239146768553712b973f45943;hb=605adc18ab63fd88e133f437d57a5c7e55509791;hp=755310e509b96f08d3dc02c588a1f82622ead898;hpb=d0d4e0ed487ea23aaf0d023513c0a4d86901b79b;p=babeltrace.git

diff --git a/src/plugins/common/param-validation/param-validation.c b/src/plugins/common/param-validation/param-validation.c
index 755310e5..bdca9f9a 100644
--- a/src/plugins/common/param-validation/param-validation.c
+++ b/src/plugins/common/param-validation/param-validation.c
@@ -223,16 +223,14 @@ enum bt_param_validation_status validate_map_value(
 
 	foreach_entry_status = bt_value_map_foreach_entry_const(map,
 		validate_map_value_entry, &data);
-	if (foreach_entry_status == BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR) {
-		status = BT_PARAM_VALIDATION_STATUS_MEMORY_ERROR;
-		goto end;
-	}
-
-	if (data.status != BT_PARAM_VALIDATION_STATUS_OK) {
+	if (foreach_entry_status == BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_INTERRUPTED) {
+		BT_ASSERT(data.status != BT_PARAM_VALIDATION_STATUS_OK);
 		status = data.status;
 		goto end;
 	}
 
+	BT_ASSERT(data.status == BT_PARAM_VALIDATION_STATUS_OK);
+
 	for (i = 0; i < data.available_keys->len; i++) {
 		const struct bt_param_validation_map_value_entry_descr *entry =
 			g_ptr_array_index(data.available_keys, i);