all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: altermo31 via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: 73985@debbugs.gnu.org
Subject: bug#73985: fix: charset.max_char may be used before being set
Date: Thu, 24 Oct 2024 11:46:17 +0000	[thread overview]
Message-ID: <xi8D9sUHNCuanOf5f9EK47MmgqcicM3hPjmS-vT6As7R2NQNKFIgBRxQpmRg_Ar8HPwaYqMrwjRf611ogPg3-55ksjhU-6L-BDPjF7Xhmi0=@proton.me> (raw)

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

Problem:
If the value to be set to charset.max_char is invalid, an error occurs, but the error uses the yet unset charset.max_char.

Solution:
Use the value that charset.max_char would be set to if the value wasn't invalid.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-fix-charset.max_char-may-be-used-before-being-set.patch --]
[-- Type: text/x-patch; name=0001-fix-charset.max_char-may-be-used-before-being-set.patch, Size: 910 bytes --]

From 64e9557c5f6ae4416a1a12fd6f68f0d19931bb99 Mon Sep 17 00:00:00 2001
From: altermo <107814000+altermo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 13:39:06 +0200
Subject: [PATCH] fix: charset.max_char may be used before being set

---
 src/charset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/charset.c b/src/charset.c
index e8d0826..14b33d2 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1007,7 +1007,7 @@ DEFUN ("define-charset-internal", Fdefine_charset_internal,
 
       i = CODE_POINT_TO_INDEX (&charset, charset.max_code);
       if (MAX_CHAR - charset.code_offset < i)
-	error ("Unsupported max char: %d", charset.max_char);
+	error ("Unsupported max char: %d", i + charset.code_offset);
       charset.max_char = i + charset.code_offset;
       i = CODE_POINT_TO_INDEX (&charset, charset.min_code);
       charset.min_char = i + charset.code_offset;
-- 
2.47.0


             reply	other threads:[~2024-10-24 11:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-24 11:46 altermo31 via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2024-10-24 14:12 ` bug#73985: fix: charset.max_char may be used before being set Eli Zaretskii
2024-10-24 14:42   ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='xi8D9sUHNCuanOf5f9EK47MmgqcicM3hPjmS-vT6As7R2NQNKFIgBRxQpmRg_Ar8HPwaYqMrwjRf611ogPg3-55ksjhU-6L-BDPjF7Xhmi0=@proton.me' \
    --to=bug-gnu-emacs@gnu.org \
    --cc=73985@debbugs.gnu.org \
    --cc=altermo31@proton.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.