New upstream version 18.11-rc3upstream/18.11-rc3

Change-Id: I958b9d019027ef049bd992b3968a667f3ae382ae
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

1 files changed, 17 insertions, 11 deletions

diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index 3de62068..91038628 100644
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -6841,20 +6841,26 @@ cli_rule_file_process(const char *file_name,
 	return 0;
 
 cli_rule_file_process_free:
-	*rule_list = NULL;
-	*n_rules = rule_id;
-	*line_number = line_id;
+	if (rule_list != NULL)
+		*rule_list = NULL;
 
-	for ( ; ; ) {
-		struct table_rule *rule;
+	if (n_rules != NULL)
+		*n_rules = rule_id;
 
-		rule = TAILQ_FIRST(list);
-		if (rule == NULL)
-			break;
+	if (line_number != NULL)
+		*line_number = line_id;
 
-		TAILQ_REMOVE(list, rule, node);
-		free(rule);
-	}
+	if (list != NULL)
+		for ( ; ; ) {
+			struct table_rule *rule;
+
+			rule = TAILQ_FIRST(list);
+			if (rule == NULL)
+				break;
+
+			TAILQ_REMOVE(list, rule, node);
+			free(rule);
+		}
 
 	if (f)
 		fclose(f);