luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UTF-8 string routines position cache now should behave correctly in all cases.

Browse source 
[INTERPRETER]
* BUG: UTF-8 string routines position cache now should behave correctly in all cases.
This commit is contained in:
gambas 2018-04-20 18:26:52 +02:00
parent 6712de717c
commit 43285550c6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/gbx/gbx_c_string.c
View file

@ -192,6 +192,7 @@ int COMMON_get_unicode_char()
char *STRING_utf8_current = NULL;
static const char *_utf8_current_start = NULL;
static int _utf8_current_len = 0;
#define UTF8_MAX_COUNT 256
#define UTF8_MAX_CACHE 64
@ -220,10 +221,11 @@ static int utf8_get_pos(const char *ref, const char *start, int len, int index)
if (index <= 0)
return 0;
if (ref != STRING_utf8_current || start != _utf8_current_start)
if (ref != STRING_utf8_current || start != _utf8_current_start || len != _utf8_current_len)
{
STRING_utf8_current = (char *)ref;
_utf8_current_start = start;
_utf8_current_len = len;
#ifdef DEBUG_CACHE
fprintf(stderr, "current -> %p / %ld\n", STRING_utf8_current, _utf8_current_start - STRING_utf8_current);
#endif