From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu Newsgroups: gmane.emacs.devel Subject: Re: master d995429e7bc: Use SBYTES instead of strlen in treesit.c Date: Mon, 22 Jul 2024 18:27:22 +0800 Message-ID: <87o76pyb5h.fsf@yahoo.com> References: <172164369582.30827.14373383262408294645@vcs2.savannah.gnu.org> <20240722102136.6C9D6C3534A@vcs2.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40828"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Stefan Kangas To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Jul 22 12:28:52 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sVqHi-000ATp-DL for ged-emacs-devel@m.gmane-mx.org; Mon, 22 Jul 2024 12:28:50 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sVqGq-0001uy-I4; Mon, 22 Jul 2024 06:27:56 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sVqGm-0001uk-4C for emacs-devel@gnu.org; Mon, 22 Jul 2024 06:27:52 -0400 Original-Received: from sonic304-20.consmr.mail.ne1.yahoo.com ([66.163.191.146]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sVqGj-0003ld-U7 for emacs-devel@gnu.org; Mon, 22 Jul 2024 06:27:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1721644067; bh=nCeiprXuO0OKhKUQYQxNYTu9RV+0dAsKdOJW+Rym33o=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=dJXQGC3E+NHhoHrFK9YTx8BHEO4HDRL/r+mmDNfMR68uysboa8FJHPjW8BFK/lRRSgP2BpI0L+NATpXAjv6iZ7INI8AqSMwu1xYdDka8uyU1hkiKIYLTZhAMSuBYbC0M1z3H3FjnNXyPHqFmSuXtavG9S/huHpxckfco0W6HEPmIcN76/YBPI62wJCcWaRWvCfykhms/P+4JcjbhC/wM1zRB6JBoK7XV9Ndgahf5Zj7sLrwOtw1j/DDmkfTMVwHXMG2QmS54Q3P2H3843VqBVIfyKOxf87zh0V7ICxo3Z48Vw132xN8Nd9rCjctbxqbCFKbfO8PVbYIzYi5/JkUDAA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1721644067; bh=OQW+n5aR+a9/VdHGSl1CCoin/pbjwwWdjMZmqksXLT3=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=hqSup6uIrsTGssmflb9Y27jfhfNxPo/W6xrWp0txG1eA/iURw0rV9Twlxi4kD8IOtjMyaxaKPXStupy+Kj9Elym3RrkbQakY5nlwkIYmU1ZSGQCT/oKec8aAWv6i3mIYNjXh3+2F8674Pgh4NOzpHzcyJlx/cJ8hcrlkJ5IGYhbGkO6xCgZmyzWNvs+9mN8AJgoRB7vI81jBZYslzUgm0jVSq7oXykSxm2i71CxpVap45KWiDvW64TZJKj8ZssVVjdIeYEFnhnxZUwaiOdksX6AeSnAaq5Q3lSS3RzGaj4yS3cbKwhbPc6fmF4PdO/dI2VbiErJkqA8KnyXH+aXEvg== X-YMail-OSG: khcV.2UVM1mSqwl74zgJZZMpK7S08eVuBNrAnF_Ja1B9rCRo4rl67CbyuDO45YR eOAyZOmogI2g8BKBmW8QzYo.pxXmVwKqW2fwoBRBZijJRrt55BnHHS2t93zeU6OAUuqmQ_Rpt6dG yRs.GT5Yk7kHXtqhlBqi6qFPkdzHWoDM9Xx7_AcffWIm1eD3JG5FP3NE10tOEoUviERwOAzVeqZ3 smlg5S70QxupIe6qRXn5ovFUrPXM.83URJ8dX9yGiwB7hYar64U4UOJy6EjRHpDGluQAnUOgtzJh RdjTDKA5qllhJJWjHEDWrGLoehM0esGsqjwBGykJCThXXpylYRI8khv.0NITgO6DIvhAnFnNcjuG q2Ocy5RUaheUckGENi_TsUH9MjhO_9o2ziPZ0F3q40wBij9QuUs8MaeeKZOTzc1c9vIjsspUM2aN B50h8LQP5q8xwySEcmUKclEVfg2tPtIWWDQ0oV4Alw1HOSW2nQbMYkXI9uiK49qgfw25PbmRiyey BVjGAKxko5GvS2rYFecJQ__cRPhsJPCqK7zy1kxrs15pRSPl5a4R_TFG_COuhmO9eZGtAolA6XBL jq_zt9UV0zndMILc4z.QLNOogns60IY5LHGfZDvsZicbkzm_ILEOqUCf48ASkcvBuk9iBcrBL4E7 wN2FHplin_QebOQWHTVF0neOW2kS6Ad5KgssJ62Ftq9Opn0KQDF1NbegU06zQzpvYAStNak4iQxU SB.5NX3Smt3qPctArI8Yn5GCYpdgaGv8MLIHpLuEpOIVB6zXQP9JMq4bE9UAlGIrDbdYrYlC9K0O LRR_zQ4iwByDLpUB4mMgkRXwNYx5DsePYeAoTQPUxk X-Sonic-MF: X-Sonic-ID: f4ca95a7-7390-48d6-a7dc-e349da4326ef Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic304.consmr.mail.ne1.yahoo.com with HTTP; Mon, 22 Jul 2024 10:27:47 +0000 Original-Received: by hermes--production-sg3-85fdb5cfc8-gthtg (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 1c129cd4b3204a0eea6eb55becea2ead; Mon, 22 Jul 2024 10:27:40 +0000 (UTC) In-Reply-To: <20240722102136.6C9D6C3534A@vcs2.savannah.gnu.org> (Stefan Kangas's message of "Mon, 22 Jul 2024 06:21:36 -0400 (EDT)") X-Mailer: WebService/1.1.22501 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo Received-SPF: pass client-ip=66.163.191.146; envelope-from=luangruo@yahoo.com; helo=sonic304-20.consmr.mail.ne1.yahoo.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:321927 Archived-At: Stefan Kangas writes: > branch: master > commit d995429e7bc2bc5b5d87db45dbbaca121f8118e5 > Author: Stefan Kangas > Commit: Stefan Kangas > > Use SBYTES instead of strlen in treesit.c > > * src/treesit.c (treesit_ensure_query_compiled) > (Ftreesit_node_child_by_field_name, treesit_initialize_query): > Use SBYTES instead of strlen. > --- > src/treesit.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/src/treesit.c b/src/treesit.c > index a420ef77b2d..c95a9fb9b01 100644 > --- a/src/treesit.c > +++ b/src/treesit.c > @@ -1310,9 +1310,7 @@ treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol, > /* Create TSQuery. */ > uint32_t error_offset; > TSQueryError error_type; > - char *treesit_source = SSDATA (source); > - treesit_query = ts_query_new (treesit_lang, treesit_source, > - strlen (treesit_source), > + treesit_query = ts_query_new (treesit_lang, SSDATA (source), SBYTES (source), > &error_offset, &error_type); > if (treesit_query == NULL) > { > @@ -2159,11 +2157,10 @@ Return nil if there is no such child. If NODE is nil, return nil. */) > CHECK_STRING (field_name); > treesit_initialize (); > > - char *name_str = SSDATA (field_name); > TSNode treesit_node = XTS_NODE (node)->node; > TSNode child > - = ts_node_child_by_field_name (treesit_node, name_str, > - strlen (name_str)); > + = ts_node_child_by_field_name (treesit_node, SSDATA (field_name), > + SBYTES (field_name)); Have you verified that these functions accept strings holding '\0'?