git_libgit2_opts: validate key

Edward Thomson · Edward Thomson · commit 7bab2e8fbf30 · 2016-02-22T23:07:30.000-05:00
diff --git a/src/settings.c b/src/settings.c
@@ -181,6 +181,9 @@ int git_libgit2_opts(int key, ...)
 		}
 
 		break;
+	default:
+		giterr_set(GITERR_INVALID, "invalid option key");
+		error = -1;
 	}
 
 	va_end(ap);
diff --git a/tests/core/opts.c b/tests/core/opts.c
@@ -17,3 +17,9 @@ void test_core_opts__readwrite(void)
 
 	cl_assert(new_val == old_val);
 }
+
+void test_core_opts__invalid_option(void)
+{
+	cl_git_fail(git_libgit2_opts(-1, "foobar"));
+}
+

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,9 @@ int git_libgit2_opts(int key, ...)`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`break;`
	`184`	`+ default:`
	`185`	`+ giterr_set(GITERR_INVALID, "invalid option key");`
	`186`	`+ error = -1;`
`184`	`187`	`}`
`185`	`188`
`186`	`189`	`va_end(ap);`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,9 @@ void test_core_opts__readwrite(void)`
`17`	`17`
`18`	`18`	`cl_assert(new_val == old_val);`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+void test_core_opts__invalid_option(void)`
	`22`	`+{`
	`23`	`+ cl_git_fail(git_libgit2_opts(-1, "foobar"));`
	`24`	`+}`
	`25`	`+`