summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-09-09 21:08:51 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-09-09 21:08:51 +0000
commit35155485bb3c31b06e3cea38773fb0c7379c8c72 (patch)
tree5c3d92c0a7cf45d08dd67c559dcec412231f124b /src
parent1bd916412dc22ac7ef0e82d3e8be29e2430b947a (diff)
downloadcoreutils-35155485bb3c31b06e3cea38773fb0c7379c8c72.tar.xz
* src/expr.c (docolon): 64-bit regex fixes.
Diffstat (limited to 'src')
-rw-r--r--src/expr.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/expr.c b/src/expr.c
index fae3795a8..3191f6e93 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -414,7 +414,7 @@ docolon (VALUE *sv, VALUE *pv)
struct re_pattern_buffer re_buffer;
struct re_registers re_regs;
size_t len;
- int matchlen;
+ regoff_t matchlen;
tostring (sv);
tostring (pv);
@@ -430,10 +430,8 @@ of the basic regular expression is not portable; it is being ignored"),
len = strlen (pv->u.s);
memset (&re_buffer, 0, sizeof (re_buffer));
memset (&re_regs, 0, sizeof (re_regs));
+ re_buffer.buffer = xnmalloc (len, 2);
re_buffer.allocated = 2 * len;
- if (re_buffer.allocated < len)
- xalloc_die ();
- re_buffer.buffer = xmalloc (re_buffer.allocated);
re_buffer.translate = NULL;
re_syntax_options = RE_SYNTAX_POSIX_BASIC;
errmsg = re_compile_pattern (pv->u.s, len, &re_buffer);
@@ -452,7 +450,7 @@ of the basic regular expression is not portable; it is being ignored"),
else
v = int_value (matchlen);
}
- else
+ else if (matchlen == -1)
{
/* Match failed -- return the right kind of null. */
if (re_buffer.re_nsub > 0)
@@ -460,6 +458,11 @@ of the basic regular expression is not portable; it is being ignored"),
else
v = int_value (0);
}
+ else
+ error (EXPR_FAILURE,
+ (matchlen == -2 ? errno : EOVERFLOW),
+ _("error in regular expression matcher"));
+
free (re_buffer.buffer);
return v;
}