From: Yuan Fu <casouri@gmail.com>
Date: Sun, 21 Jul 2024 23:50:59 +0000 (-0700)
Subject: Fix segfault when deleting tree-sitter query (bug#72238)
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~652
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ed38fcc01703d166d8a63989f8167b50ebd954a0;p=emacs.git

Fix segfault when deleting tree-sitter query (bug#72238)

* src/treesit.c (treesit_delete_query): Only delete query and cursor
when they are non-NULL.
---

diff --git a/src/treesit.c b/src/treesit.c
index 3ae55d77a91..416c1edf791 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1224,8 +1224,10 @@ treesit_delete_parser (struct Lisp_TS_Parser *lisp_parser)
 void
 treesit_delete_query (struct Lisp_TS_Query *lisp_query)
 {
-  ts_query_delete (lisp_query->query);
-  ts_query_cursor_delete (lisp_query->cursor);
+  if (lisp_query->query)
+    ts_query_delete (lisp_query->query);
+  if (lisp_query->cursor)
+    ts_query_cursor_delete (lisp_query->cursor);
 }
 
 /* The following function is called from print.c:print_vectorlike.  */