summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2022-03-08 15:35:39 +0200
committerEli Zaretskii <eliz@gnu.org>2022-03-08 15:35:39 +0200
commitd184773c2e2a69bea9b96190c83727b4e7a16542 (patch)
tree6483b6d0d5b049a02cb7359b65c7d23af48760f7
parent80736aef9085ad04e59902b0d0a31fb1f663858b (diff)
downloademacs-d184773c2e2a69bea9b96190c83727b4e7a16542.tar.gz
Avoid assertion violations in 'bidi_resolve_brackets'
* src/bidi.c (bidi_resolve_brackets): Move assertion to where it really matters. (Bug#54295)
-rw-r--r--src/bidi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bidi.c b/src/bidi.c
index a548960048a..9449e099446 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2921,13 +2921,13 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
int embedding_level = bidi_it->level_stack[bidi_it->stack_idx].level;
bidi_type_t embedding_type = (embedding_level & 1) ? STRONG_R : STRONG_L;
- eassert (bidi_it->prev_for_neutral.type != UNKNOWN_BT);
eassert (bidi_it->bracket_pairing_pos > bidi_it->charpos);
if (bidi_it->bracket_enclosed_type == embedding_type) /* N0b */
type = embedding_type;
else if (bidi_it->bracket_enclosed_type == STRONG_L /* N0c, N0d */
|| bidi_it->bracket_enclosed_type == STRONG_R)
{
+ eassert (bidi_it->prev_for_neutral.type != UNKNOWN_BT);
switch (bidi_it->prev_for_neutral.type)
{
case STRONG_R:
@@ -2946,7 +2946,6 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
break;
default:
/* N0d: Do not set the type for that bracket pair. */
- /* (Actuallly, this shouldn't happen.) */
break;
}
}