diff options
| author | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:35:40 +0100 |
|---|---|---|
| committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:35:40 +0100 |
| commit | b1de003dac299705a7f01c997d2b866bafe39926 (patch) | |
| tree | 1cc16a3877e945116387a380f7f3023f81fa36e4 /lib/unistr/u8-mbsnlen.c | |
| parent | 752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (diff) | |
| parent | 3590c846d4c2febbc05b4ad6b14a06edc549e453 (diff) | |
Merge tag 'upstream/0.9.6+really0.9.6'
Upstream version 0.9.6+really0.9.6
Diffstat (limited to 'lib/unistr/u8-mbsnlen.c')
| -rw-r--r-- | lib/unistr/u8-mbsnlen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/unistr/u8-mbsnlen.c b/lib/unistr/u8-mbsnlen.c index 9ddc42e..ce13c38 100644 --- a/lib/unistr/u8-mbsnlen.c +++ b/lib/unistr/u8-mbsnlen.c @@ -1,5 +1,5 @@ /* Count characters in UTF-8 string. - Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2007. This program is free software: you can redistribute it and/or modify it @@ -33,7 +33,9 @@ u8_mbsnlen (const uint8_t *s, size_t n) characters++; if (count == -2) break; - if (count <= 0) + if (count < 0) + count = u8_mbtouc (&uc, s, n); + else if (count == 0) count = 1; s += count; n -= count; |