Resolve a conflict from last merge

stevegrubb · stevegrubb · commit 9787a0341cf8 · 2025-06-21T13:52:38.000-04:00
diff --git a/auparse/interpret.c b/auparse/interpret.c
@@ -517,8 +517,12 @@ const char *_auparse_lookup_interpretation(auparse_state_t *au,const char *name)
 
 void free_interpretation_list(auparse_state_t *au)
 {
-	nvlist_clear(&il, 0);
-	il.cnt = NEVER_LOADED;
+	nvlist *il = &au->interpretations;
+
+	if (il->cnt != NEVER_LOADED || il->array) {
+		nvlist_clear(il, 0);
+		il->cnt = NEVER_LOADED;
+	}
 }
 
 // This uses a sentinel to determine if the list has ever been loaded.

Original file line number	Diff line number	Diff line change
`@@ -517,8 +517,12 @@ const char _auparse_lookup_interpretation(auparse_state_t au,const char *name)`
`517`	`517`
`518`	`518`	`void free_interpretation_list(auparse_state_t *au)`
`519`	`519`	`{`
`520`		`- nvlist_clear(&il, 0);`
`521`		`- il.cnt = NEVER_LOADED;`
	`520`	`+ nvlist *il = &au->interpretations;`
	`521`	`+`
	`522`	`+ if (il->cnt != NEVER_LOADED \|\| il->array) {`
	`523`	`+ nvlist_clear(il, 0);`
	`524`	`+ il->cnt = NEVER_LOADED;`
	`525`	`+ }`
`522`	`526`	`}`
`523`	`527`
`524`	`528`	`// This uses a sentinel to determine if the list has ever been loaded.`