Mercurial > hg > octave-lojdl > gnulib-hg
annotate lib/wcswidth-impl.h @ 14418:07a5551df5ac
wcswidth, mbswidth: Avoid integer overflow.
* lib/wcswidth.c: Include <limits.h>.
* lib/wcswidth-impl.h (wcswidth): Avoid 'int' overflow.
* lib/mbswidth.c: Include <limits.h>.
(mbsnwidth): Avoid 'int' overflow.
Reported by Jim Meyering.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 12 Mar 2011 13:54:43 +0100 |
| parents | 7357862f4745 |
| children | 8250f2777afc |
| rev | line source |
|---|---|
| 14303 | 1 /* Determine number of screen columns needed for a size-bounded wide string. |
| 2 Copyright (C) 1999, 2011 Free Software Foundation, Inc. | |
| 3 Written by Bruno Haible <bruno@clisp.org>, 1999. | |
| 4 | |
| 5 This program is free software: you can redistribute it and/or modify | |
| 6 it under the terms of the GNU General Public License as published by | |
| 7 the Free Software Foundation; either version 3 of the License, or | |
| 8 (at your option) any later version. | |
| 9 | |
| 10 This program is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 GNU General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
| 16 along with this program. If not, see <http://www.gnu.org/licenses/>. */ | |
| 17 | |
| 18 int | |
| 19 wcswidth (const wchar_t *s, size_t n) | |
| 20 { | |
| 21 int count = 0; | |
| 22 for (; n > 0; s++, n--) | |
| 23 { | |
| 24 wchar_t c = *s; | |
| 25 if (c == (wchar_t)'\0') | |
| 26 break; | |
| 27 { | |
| 28 int width = wcwidth (c); | |
| 29 if (width < 0) | |
| 30 goto found_nonprinting; | |
|
14418
07a5551df5ac
wcswidth, mbswidth: Avoid integer overflow.
Bruno Haible <bruno@clisp.org>
parents:
14303
diff
changeset
|
31 if (width > INT_MAX - count) |
|
07a5551df5ac
wcswidth, mbswidth: Avoid integer overflow.
Bruno Haible <bruno@clisp.org>
parents:
14303
diff
changeset
|
32 goto overflow; |
| 14303 | 33 count += width; |
| 34 } | |
| 35 } | |
| 36 return count; | |
| 37 | |
| 38 found_nonprinting: | |
| 39 return -1; | |
|
14418
07a5551df5ac
wcswidth, mbswidth: Avoid integer overflow.
Bruno Haible <bruno@clisp.org>
parents:
14303
diff
changeset
|
40 |
|
07a5551df5ac
wcswidth, mbswidth: Avoid integer overflow.
Bruno Haible <bruno@clisp.org>
parents:
14303
diff
changeset
|
41 overflow: |
|
07a5551df5ac
wcswidth, mbswidth: Avoid integer overflow.
Bruno Haible <bruno@clisp.org>
parents:
14303
diff
changeset
|
42 return INT_MAX; |
| 14303 | 43 } |