* server/core.c (set_override): Catch errors returned by

notroj · notroj · commit 906fd9598e51 · 2024-04-16T09:57:37.000Z
set_allow_opts() for a parsing fail in an Options= argument. Submitted by: Zhou Qingyang <zhou1615 umn.edu> Github: closes #310 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1917017 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/server/core.c b/server/core.c
@@ -1906,8 +1906,10 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l)
         }
         else if (!ap_cstr_casecmp(k, "Options")) {
             d->override |= OR_OPTIONS;
-            if (v)
-                set_allow_opts(cmd, &(d->override_opts), v);
+            if (v) {
+                if ((err = set_allow_opts(cmd, &(d->override_opts), v)) != NULL)
+                    return err;
+	    }
             else
                 d->override_opts = OPT_ALL;
         }

Original file line number	Diff line number	Diff line change
`@@ -1906,8 +1906,10 @@ static const char set_override(cmd_parms cmd, void d_, const char l)`
`1906`	`1906`	`}`
`1907`	`1907`	`else if (!ap_cstr_casecmp(k, "Options")) {`
`1908`	`1908`	`d->override \|= OR_OPTIONS;`
`1909`		`- if (v)`
`1910`		`- set_allow_opts(cmd, &(d->override_opts), v);`
	`1909`	`+ if (v) {`
	`1910`	`+ if ((err = set_allow_opts(cmd, &(d->override_opts), v)) != NULL)`
	`1911`	`+ return err;`
	`1912`	`+ }`
`1911`	`1913`	`else`
`1912`	`1914`	`d->override_opts = OPT_ALL;`
`1913`	`1915`	`}`