Was miscomputing end of string position for FcStrtod in locales with

    multibyte separators (2.2 branch)

diff --git a/src/fcxml.c b/src/fcxml.c
index 657959c158c7c4733b3df510c1be4f3e41e51163..ffde1b69f4a8df0d0b1547fe20212b15d2aee08d 100644 (file)
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -962,7 +962,7 @@ FcStrtod (char *s, char **end)
            buf_end = 0;
            v = strtod (buf, &buf_end);
            if (buf_end)
-               buf_end = s + (buf_end - buf);
+               buf_end = s + (buf_end - buf) + 1 - dlen;
            if (end)
                *end = buf_end;
        }