nodejs
diff --git a/‎src/node_sqlite.cc‎
Lines changed: 8 additions & 0 deletions b/‎src/node_sqlite.cc‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/parallel/test-sqlite-template-tag.js‎
Lines changed: 23 additions & 0 deletions b/‎test/parallel/test-sqlite-template-tag.js‎
Lines changed: 23 additions & 0 deletions
@@ -3659,6 +3659,14 @@ BaseObjectPtr<StatementSync> SQLTagStore::PrepareStatement(
       return BaseObjectPtr<StatementSync>();
     }
 
+    // sqlite3_prepare_v2() reports success without producing a statement when
+    // the input holds no SQL, such as a comment. Such a statement cannot be
+    // bound or executed, so reject it instead of caching it.
+    if (s == nullptr) {
+      THROW_ERR_INVALID_ARG_VALUE(env, "The SQL query contains no statements.");
+      return BaseObjectPtr<StatementSync>();
+    }
+
     BaseObjectPtr<StatementSync> stmt_obj = StatementSync::Create(
         env, BaseObjectPtr<DatabaseSync>(session->database_), s);
 
 
@@ -317,6 +317,29 @@ test('sql error messages are descriptive', () => {
   });
 });
 
+test('rejects SQL that contains no statements', () => {
+  const expectedError = {
+    code: 'ERR_INVALID_ARG_VALUE',
+    message: /contains no statements/,
+  };
+
+  for (const method of ['run', 'get', 'all', 'iterate']) {
+    assert.throws(() => {
+      // eslint-disable-next-line no-unused-expressions
+      sql[method]`-- comment`;
+    }, expectedError);
+
+    assert.throws(() => {
+      // eslint-disable-next-line no-unused-expressions
+      sql[method]``;
+    }, expectedError);
+  }
+
+  // A rejected statement must not be cached, so a later valid query with the
+  // same tag store still works.
+  assert.strictEqual(sql.run`INSERT INTO foo (text) VALUES (${'bob'})`.changes, 1);
+});
+
 test('a tag store keeps the database alive by itself', () => {
   const sql = new DatabaseSync(':memory:').createTagStore();