options: rewrite config file parser

The format doesn't change. Some details are different, though. For
example, it will now accept option values with spaces even if they're
not quoted. (I see no reason why the user should be forced to add
quotes.)

The code is now smaller and should be much easier to extend. It also
can load config from in-memory buffers, which might be helpful in the
future.

read_file() should eventually be replaced with stream_read_complete().
But since the latter function may access options under various
circumstances, and also needs access to the mpv_global struct, there
is a separate implementation for now.

1 files changed, 8 insertions, 0 deletions

diff --git a/options/m_config.c b/options/m_config.c
index 5925b7a159..f4179e08cf 100644
--- a/options/m_config.c
+++ b/options/m_config.c
@@ -42,6 +42,8 @@ static const union m_option_value default_value;
 // Profiles allow to predefine some sets of options that can then
 // be applied later on with the internal -profile option.
 #define MAX_PROFILE_DEPTH 20
+// Maximal include depth.
+#define MAX_RECURSION_DEPTH 8
 
 struct m_profile {
     struct m_profile *next;
@@ -66,8 +68,14 @@ static int parse_include(struct m_config *config, struct bstr param, bool set,
         return M_OPT_MISSING_PARAM;
     if (!set)
         return 1;
+    if (config->recursion_depth >= MAX_RECURSION_DEPTH) {
+        MP_ERR(config, "Maximum 'include' nesting depth exceeded.\n");
+        return M_OPT_INVALID;
+    }
     char *filename = bstrdup0(NULL, param);
+    config->recursion_depth += 1;
     config->includefunc(config->includefunc_ctx, filename, flags);
+    config->recursion_depth -= 1;
     talloc_free(filename);
     return 1;
 }