From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: David Fussner via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#52438: 29.0.50; [PATCH] Fix off-by-one error in etags.c TeX support Date: Sun, 12 Dec 2021 10:22:25 +0000 Message-ID: References: <87lf0qfkh4.fsf@gnus.org> Reply-To: David Fussner Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31695"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 52438@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Dec 12 11:23:22 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1mwM0o-00081M-FB for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 12 Dec 2021 11:23:22 +0100 Original-Received: from localhost ([::1]:38882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mwM0n-0006pL-JC for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 12 Dec 2021 05:23:21 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:40344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mwM0g-0006oN-2r for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2021 05:23:14 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:39174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mwM0U-000182-AZ for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2021 05:23:13 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mwM0U-0007Pn-2h for bug-gnu-emacs@gnu.org; Sun, 12 Dec 2021 05:23:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: David Fussner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 12 Dec 2021 10:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52438 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch moreinfo Original-Received: via spool by 52438-submit@debbugs.gnu.org id=B52438.163930458028483 (code B ref 52438); Sun, 12 Dec 2021 10:23:02 +0000 Original-Received: (at 52438) by debbugs.gnu.org; 12 Dec 2021 10:23:00 +0000 Original-Received: from localhost ([127.0.0.1]:50720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwM0S-0007PL-86 for submit@debbugs.gnu.org; Sun, 12 Dec 2021 05:23:00 -0500 Original-Received: from mail-qt1-f176.google.com ([209.85.160.176]:35633) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mwM0Q-0007P7-Pd for 52438@debbugs.gnu.org; Sun, 12 Dec 2021 05:22:59 -0500 Original-Received: by mail-qt1-f176.google.com with SMTP id j17so12672237qtx.2 for <52438@debbugs.gnu.org>; Sun, 12 Dec 2021 02:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=B8u2SBXYb96sF+ZlMzYZajv7NeQTMTf6tUeNPLA0/nc=; b=E2c75VJKxIRXRPunvuBu1mvUZ+6TnDrmhedMntt4hx8kk/xJFIpZlECRiaItWOMDCS vAa09NPef1OQGI/oSw8aI1wLkoKYCSmEdoPxxgvBLJzlT8AjUck1fKb6SidUBVh4c18Z 3ISEPKenULOAiahQMVI2XSaX/46gjW3v+l9bNkIoFaaMYki7OHSOuk/6GDOIRKfV5KX5 o67hcwNLlRuU7ZAPgi7lvNywggp+BUrYN+aeObtQLqUrwFUEKB8zxSK23ZsXY9EXUL5M SDFmGBkutMfv/5sGtsW3idBWbhxDuh3RqcJ33ZWxsix7YBx1HVb8x6QKM4PtCob9e6Nz ytpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=B8u2SBXYb96sF+ZlMzYZajv7NeQTMTf6tUeNPLA0/nc=; b=ZehekieeLIBNIwGFmDglqVgJUNlgdjntCjX4AfCz5wonZPmHGXHN7YPrLrDGqqQM9s RO54mvIPmxXqDQP6CecVKW1WhZvIKgAjGprGDbzi+ZGuSDtXY3/eOTMG1jVjd2k+qnuv Y6cm+hwHRJanZ7QrZQHvro37j/NOrd9bU2lmjtis8nOwrHdkMU6c0tBptzD9BUeiCjBS wyucNngCkGDSloIVyQpKrOL9jVBivaEJTRdlCiq+CsR9/z78UPOMS0Pu3Mo+T78D+D0n rM07ppHQB1Tf6xDvh5vzNQhqZYXGY9wTLejcfAZmhXZkKEeETkJmuvHzTMNg3SXj36BJ eFJA== X-Gm-Message-State: AOAM531WSEIgPJvl/wGahTjW00IX5WW9cLZyluDctbbot0wN4IRvPtAg WOWHfqoE7EsBfZ7XNv0gcKfD25bpBVYbVO3Rqkg= X-Google-Smtp-Source: ABdhPJxXTojPEl9PuD+/awpxN957AeB4IgIv0ZAHrSvTot30MdrDG34a8hcv75YLVpFVhw+t4bysj2XkzbSX2kJxtAo= X-Received: by 2002:a05:622a:1483:: with SMTP id t3mr38055346qtx.518.1639304573325; Sun, 12 Dec 2021 02:22:53 -0800 (PST) In-Reply-To: <87lf0qfkh4.fsf@gnus.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:222202 Archived-At: Hi Lars, > I'm not able to reproduce the issue on my 64-bit Debian system, but > reading the code, I think your analysis of the problem sounds correct. > The patch seemed slightly confusing, though, so I rewrote it a bit. > Could you check whether this version also fixes the problem? If my code was merely confusing and inelegant rather than flat-out incorrect then that's a triumph :-) > diff --git a/lib-src/etags.c b/lib-src/etags.c > index bd4d4fcf53..ba66eeede4 100644 > --- a/lib-src/etags.c > +++ b/lib-src/etags.c > @@ -5773,7 +5773,7 @@ TeX_commands (FILE *inf) > TEX_decode_env (const char *evarname, const char *defenv) > { > const char *env, *p; > - ptrdiff_t len; > + ptrdiff_t len = 1; > > /* Append default string to environment. */ > env = getenv (evarname); > @@ -5782,8 +5782,13 @@ TEX_decode_env (const char *evarname, const char *defenv) > else > env = concat (env, defenv, ""); > > + /* If the environment variable starts with a colon, increase the > + length of the token table. */ > + if (!strneq (env, ":", 1)) > + len++; > + > /* Allocate a token table */ > - for (len = 1, p = env; (p = strchr (p, ':')); ) > + for (p = env; (p = strchr (p, ':')); ) > if (*++p) > len++; > TEX_toktab = xnew (len, linebuffer); > That fixes the issue here, thank you very much! ( I guess Andreas' comment on my strneq test is well-founded, though?) Please close this bug if/when you apply your fix. David.