aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

UTF-8: Stepping functions set *count even if an assertion fails.

Browse Source 
Previously, utf8_step_forward() and utf8_step_backward() left *count
unchanged if some parameter was invalid.  Now, they properly store 0.
This flaw had no effect in practice, because all current callers pass
count=NULL, and invalid parameters shouldn't be used anyway.
This commit is contained in:
Kalle Olavi Niemitalo 2006-09-03 03:08:56 +03:00 committed by Kalle Olavi Niemitalo
parent 86c9cb01ba
commit a01be8bd6b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/intl/charsets.c
View File

@ -395,7 +395,7 @@ utf8_step_forward(unsigned char *string, unsigned char *end,
assert(string); assert(string);
assert(max >= 0); assert(max >= 0);
if_assert_failed return string; if_assert_failed goto invalid_arg;
if (end == NULL) if (end == NULL)
end = strchr(string, '\0'); end = strchr(string, '\0');
@ -439,6 +439,7 @@ utf8_step_forward(unsigned char *string, unsigned char *end,
INTERNAL("impossible enum utf8_step"); INTERNAL("impossible enum utf8_step");
} }
invalid_arg:
if (count) if (count)
*count = steps; *count = steps;
return current; return current;
@ -463,7 +464,7 @@ utf8_step_backward(unsigned char *string, unsigned char *start,
assert(string); assert(string);
assert(start); assert(start);
assert(max >= 0); assert(max >= 0);
if_assert_failed return string; if_assert_failed goto invalid_arg;
switch (way) { switch (way) {
case utf8_step_characters: case utf8_step_characters:
@ -511,6 +512,7 @@ utf8_step_backward(unsigned char *string, unsigned char *start,
INTERNAL("impossible enum utf8_step"); INTERNAL("impossible enum utf8_step");
} }
invalid_arg:
if (count) if (count)
*count = steps; *count = steps;
return current; return current;