* lib/regex_internal.c (re_string_reconstruct): Don't assume buffer

[pspp] / lib / regex_internal.c

diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index 05cd335efe6d550953e7eff2856c867b5c70f3df..bf3246105a17f3420d87ede189ae1d4457a3eee8 100644 (file)
--- a/lib/regex_internal.c
+++ b/lib/regex_internal.c
@@ -557,8 +557,11 @@ static reg_errcode_t
 internal_function
 re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
 {
-  regoff_t offset = (regoff_t) idx - (regoff_t) pstr->raw_mbs_idx;
-  if (BE (offset < 0, 0))
+  Idx offset;
+
+  if (BE (pstr->raw_mbs_idx <= idx, 0))
+    offset = idx - pstr->raw_mbs_idx;
+  else
     {
       /* Reset buffer.  */
 #ifdef RE_ENABLE_I18N