fdbf5e0 sql: rewrite pkg regexp to accept null values as input — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

sql: rewrite pkg regexp to accept null values as input

Baptiste Daroussin committed 3 years ago

commit fdbf5e0aae5339d7759c9d09be8729672cb539c3
parent 0b15679

1 file changed +11 -6

modified libpkg/pkgdb.c

@@ -126,11 +126,14 @@ pkgdb_regex(sqlite3_context *ctx, int argc, sqlite3_value **argv)

 	regex_t			*re;
 	int			 ret;
 	if (argc != 2 || (regex = sqlite3_value_text(argv[0])) == NULL ||
 		(str = sqlite3_value_text(argv[1])) == NULL) {
 		pkg_debug(4, "meh, %s", str);
 	if (argc != 2) {
 		sqlite3_result_error(ctx, "SQL function regex() called "
 		    "with invalid arguments.\n", -1);
 		    "with invalid number of arguments.\n", -1);
 		return;
 	}
 	if ((regex = sqlite3_value_text(argv[0])) == NULL) {
 		sqlite3_result_error(ctx, "SQL function regex() called "
 		    "without a regular expression.\n", -1);
 		return;
 	}

@@ -153,8 +156,10 @@ pkgdb_regex(sqlite3_context *ctx, int argc, sqlite3_value **argv)

 		sqlite3_set_auxdata(ctx, 0, re, pkgdb_regex_delete);
 	}
 	ret = regexec(re, str, 0, NULL, 0);
 	sqlite3_result_int(ctx, (ret != REG_NOMATCH));
 	if ((str = sqlite3_value_text(argv[1])) != NULL) {
 		ret = regexec(re, str, 0, NULL, 0);
 		sqlite3_result_int(ctx, (ret != REG_NOMATCH));
 	}
 }
 void