Changeset: b0945a7560ed for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0945a7560ed
Modified Files:
        clients/mapiclient/mclient.c
Branch: Jul2015
Log Message:

Fix off-by-one error in East Asian character handling.


diffs (20 lines):

diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -446,10 +446,15 @@ static char *
 utf8skip(char *s, size_t i)
 {
        char *s0 = s;
+       char *p = s;
+       size_t l;
 
        while (*s) {
-               if (utf8strlen(s0, s) >= i)
+               if ((l = utf8strlen(s0, s)) > i)
+                       return p;
+               else if (l == i)
                        return s;
+               p = s;
                if ((*s & 0xC0) == 0xC0) {
                        s++;
                        while ((*s & 0xC0) == 0x80)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to