lightningd/plugin: unregister plugin's options at destruction

lightningd/plugin.c

@@ -48,6 +48,10 @@ struct plugins *plugins_new(const tal_t *ctx, struct log_book *log_book,
 
 static void destroy_plugin(struct plugin *p)
 {
+	struct plugin_opt *opt;
+
+	list_for_each(&p->plugin_opts, opt, list)
+		opt_unregister(opt->name);
 	plugin_hook_unregister_all(p);
 	list_del(&p->list);
 }
@@ -487,7 +491,7 @@ static bool plugin_opt_add(struct plugin *plugin, const char *buffer,
 	popt = tal(plugin, struct plugin_opt);
 	popt->value = talz(popt, struct plugin_opt_value);
 
-	popt->name = tal_fmt(plugin, "--%.*s", nametok->end - nametok->start,
+	popt->name = tal_fmt(popt, "--%.*s", nametok->end - nametok->start,
 			     buffer + nametok->start);
 	if (json_tok_streq(buffer, typetok, "string")) {
 		popt->type = "string";