c40314f (r)query: stricter argument validation — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

(r)query: stricter argument validation

Baptiste Daroussin committed 3 years ago

commit c40314fea0a4a89b9f55076f56367b996feda1fd
parent 1bf51ad

2 files changed +15 -10

modified src/query.c

@@ -957,6 +957,11 @@ exec_query(int argc, char **argv)

 		return (EXIT_FAILURE);
 	}
 	if ((match == MATCH_ALL || condition != NULL || pkgname != NULL)
 	    && argc > 1) {
 		usage_query();
 		return (EXIT_FAILURE);
 	}
 	if (argc == 0) {
 		usage_query();

modified tests/frontend/query.sh

@@ -73,21 +73,21 @@ EOF

 		pkg query -e "%#r>0" "%n: %rn %rv %ro"
 	atf_check \
 		-o inline:"test: plop 1 plop\n" \
 		-e empty \
 		-s exit:0 \
 		-o empty \
 		-e match:"Usage:.*" \
 		-s exit:1 \
 		pkg query -e "%#r>0" "%n: %rn %rv %ro" test
 	atf_check \
 		-o empty \
 		-e empty \
 		-e match:"Usage:.*" \
 		-s exit:1 \
 		pkg query -e "%#r>0" "%n: %rn %rv %ro" plop
 	atf_check \
 		-o inline:"test: plop 1 plop\n" \
 		-e empty \
 		-s exit:0 \
 		-o empty \
 		-e match:"Usage:.*" \
 		-s exit:1 \
 		pkg query -e "%#r>0" "%n: %rn %rv %ro" plop test
 	atf_check \

@@ -109,9 +109,9 @@ EOF

 		pkg query -e "%#d>0" "%n: %dn %dv %do"
 	atf_check \
 		-o inline:"plop: test 1 test\n" \
 		-e empty \
 		-s exit:0 \
 		-o empty \
 		-e match:"Usage:.*" \
 		-s exit:1 \
 		pkg query -e "%#d>0" "%n: %dn %dv %do" plop test
 	atf_check \