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

casouri · casouri · commit ed38fcc01703 · 2024-07-21T17:14:08.000-07:00
* 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
@@ -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.  */

Original file line number	Diff line number	Diff line change
`@@ -1224,8 +1224,10 @@ treesit_delete_parser (struct Lisp_TS_Parser *lisp_parser)`
`1224`	`1224`	`void`
`1225`	`1225`	`treesit_delete_query (struct Lisp_TS_Query *lisp_query)`
`1226`	`1226`	`{`
`1227`		`- ts_query_delete (lisp_query->query);`
`1228`		`- ts_query_cursor_delete (lisp_query->cursor);`
	`1227`	`+ if (lisp_query->query)`
	`1228`	`+ ts_query_delete (lisp_query->query);`
	`1229`	`+ if (lisp_query->cursor)`
	`1230`	`+ ts_query_cursor_delete (lisp_query->cursor);`
`1229`	`1231`	`}`
`1230`	`1232`
`1231`	`1233`	`/* The following function is called from print.c:print_vectorlike. */`