summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-01-01 17:08:46 -0500
committerJune McEnroe <june@causal.agency>2020-01-01 17:08:46 -0500
commit5be4a8436b98988944c909f7da5384078a843916 (patch)
tree13f4ac913932ed97f194aff47efcbc437a06f2a4
parentDon't special case user being * in queries (diff)
downloadlitterbox-5be4a8436b98988944c909f7da5384078a843916.tar.gz
litterbox-5be4a8436b98988944c909f7da5384078a843916.zip
Assert that SQL query fits in buffer
-rw-r--r--scoop.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/scoop.c b/scoop.c
index 0bf3230..bd1ef2d 100644
--- a/scoop.c
+++ b/scoop.c
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <assert.h>
 #include <err.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -335,9 +336,10 @@ int main(int argc, char *argv[]) {
 		errx(EX_CONFIG, "database out of date; migrate with litterbox -m");
 	}
 
+	int len;
 	char sql[4096];
 	if (search) {
-		snprintf(
+		len = snprintf(
 			sql, sizeof(sql),
 			"WITH results AS (%s AND %s AND %s %s) %s;",
 			Inner, Search, (where ? where : "true"), Limit,
@@ -345,12 +347,13 @@ int main(int argc, char *argv[]) {
 		);
 		binds[n++] = Bind(":search", search, 0);
 	} else {
-		snprintf(
+		len = snprintf(
 			sql, sizeof(sql),
 			"WITH results AS (%s AND %s %s) %s;",
 			Inner, (where ? where : "true"), Limit, (group ? Group : Outer)
 		);
 	}
+	assert((size_t)len < sizeof(sql));
 
 	sqlite3_stmt *stmt = dbPrepare(sql);
 	for (int i = 0; i < n; ++i) {
1f761cb4593706bfeb721b478bf4e7ea7c6&follow=1'>Factor out common parts of downgrade messagesJune McEnroe Also bump the message cap to 1024 because that is ostensibly useful for replying to older messages. 2021-09-14Add downgrade IRC botJune McEnroe 2021-09-14Sort by title if authors matchJune McEnroe There are probably better things to sort by but title definitely always exists. 2021-09-13Swap-remove tags as they're foundJune McEnroe This makes it even faster. From ~1s on a sqlite3.c amalgamation to ~0.85s. 2021-09-12Replace htagml regex with strncmpJune McEnroe Since ctags only ever produces regular expressions of the form /^re$/ or /^re/ with no other special characters, instead unescape the pattern and simply use strncmp. Running on a sqlite3.c amalgamation, the regex version takes ~37s while the strncmp version takes ~1s, producing identical output. Big win! 2021-09-11Also defer printing comment for lone close-parensJune McEnroe 2021-09-10Publish "git-comment"June McEnroe 2021-09-10Add git comment --pretty optionJune McEnroe 2021-09-08Defer printing comment if line is blank or closing braceJune McEnroe This fixes badly indented comments. 2021-09-08Up default min-repeat to 30 linesJune McEnroe 2021-09-08Handle dirty lines in git-commentJune McEnroe 2021-09-08Document and install git-commentJune McEnroe 2021-09-08Add repeat and all options to git-commentJune McEnroe 2021-09-08Add group threshold to git-commentJune McEnroe