player/command: fix def-val logic and choices leak

Use m_option_get_node to get default value. Fix choices talloc_strdup
memory leak.

Author: zenodity

player/command.c

@@ -4010,27 +4010,6 @@ static int mp_property_commands(void *ctx, struct m_property *prop,
                 node_map_add_string(ae, "name", a->name);
                 node_map_add_string(ae, "type", a->type->name);
                 node_map_add_flag(ae, "optional", a->flags & MP_CMD_OPT_ARG);
-                if (a->defval) {
-                    if (a->type == &m_option_type_int) {
-                        node_map_add_int64(ae, "default-value",
-                            *(const int *)a->defval);
-                    } else if (a->type == &m_option_type_int64) {
-                        node_map_add_int64(ae, "default-value",
-                            *(const int64_t *)a->defval);
-                    } else if (a->type == &m_option_type_double) {
-                        node_map_add_double(ae, "default-value",
-                            *(const double *)a->defval);
-                    } else if (a->type == &m_option_type_float) {
-                        node_map_add_double(ae, "default-value",
-                            *(const double *)a->defval);
-                    } else if (a->type == &m_option_type_flag) {
-                        node_map_add_flag(ae, "default-value",
-                            *(const bool *)a->defval);
-                    } else if (a->type == &m_option_type_string) {
-                        node_map_add_string(ae, "default-value",
-                            *(const char **)a->defval);
-                    }
-                }
                 if (a->type == &m_option_type_choice ||
                     a->type == &m_option_type_flags) {
                     const struct m_opt_choice_alternatives *alt = a->priv;
@@ -4046,9 +4025,15 @@ static int mp_property_commands(void *ctx, struct m_property *prop,
                         for (int j = 0; alt[j].name; j++) {
                            struct mpv_node *ce = node_array_add(choices, MPV_FORMAT_NONE);
                            ce->format = MPV_FORMAT_STRING;
-                           ce->u.string = talloc_strdup(NULL, alt[j].name);
+                           ce->u.string = talloc_strdup(choices->u.list, alt[j].name);
                         }
                     }
+                } else {
+                    if (a->defval) {
+                        struct mpv_node *def =
+                            node_map_add(ae, "default-value", MPV_FORMAT_NONE);
+                        m_option_get_node(a, NULL, def, (void *)a->defval);
+                    }
                 }
             }