diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-05-31 00:16:44 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-05-31 00:16:44 +0000 |
| commit | 0064a8a9866779dceb087452b9bfaa733c51adce (patch) | |
| tree | 3fdfd380d1e3b371bed489f787cf1c3a69e22234 /regexec.c | |
| parent | 9c5ffd7c3fe1ab64d3e7d06810ac3ab42426718b (diff) | |
| download | perl-0064a8a9866779dceb087452b9bfaa733c51adce.tar.gz | |
Salvage bits and pieces from the experimental 'utf8 everywhere'
patch: rename HINT_BYTE and IN_BYTE to HINT_BYTES and IN_BYTES
to match the pragma name; various robustness cleanups.
p4raw-id: //depot/perl@10339
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -966,7 +966,8 @@ S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *sta else { U8 *r = reghop3((U8*)s, -1, (U8*)startpos); - tmp = (I32)utf8n_to_uvchr(r, s - (char*)r, 0, 0); + if (s > (char*)r) + tmp = (I32)utf8n_to_uvchr(r, s - (char*)r, 0, 0); } tmp = ((OP(c) == BOUND ? isALNUM_uni(tmp) : isALNUM_LC_uvchr(UNI_TO_NATIVE(tmp))) != 0); @@ -1009,7 +1010,8 @@ S_find_byclass(pTHX_ regexp * prog, regnode *c, char *s, char *strend, char *sta else { U8 *r = reghop3((U8*)s, -1, (U8*)startpos); - tmp = (I32)utf8n_to_uvchr(r, s - (char*)r, 0, 0); + if (s > (char*)r) + tmp = (I32)utf8n_to_uvchr(r, s - (char*)r, 0, 0); } tmp = ((OP(c) == NBOUND ? isALNUM_uni(tmp) : isALNUM_LC_uvchr(UNI_TO_NATIVE(tmp))) != 0); |