diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2017-06-02 14:47:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-02 14:47:38 +0200 |
| commit | 31b9d115b065570020ce9be1a1d8cd49212f70a9 (patch) | |
| tree | 22325a4fd215c38678859aa9033e55a130574897 /src/fe-common | |
| parent | 784358632371008591731879f5ae20e3a0afb3db (diff) | |
| parent | 632b0ce5e68ce32ade90382cb64fbb8d1e75090d (diff) | |
| download | irssi-31b9d115b065570020ce9be1a1d8cd49212f70a9.zip | |
Merge pull request #706 from dequis/parse-uint
Add parse_uint function to improve integer overflow handling
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/core/formats.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 17c13a97..005e6fb7 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -33,6 +33,7 @@ #include "themes.h" #include "recode.h" #include "utf8.h" +#include "misc.h" static const char *format_backs = "04261537"; static const char *format_fores = "kbgcrmyw"; @@ -870,8 +871,9 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str, { static char ansitab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 }; const char *start; - int fg, bg, flags, num, i; - unsigned int num2; + char *endptr; + int fg, bg, flags, i; + guint num, num2; if (*str != '[') return str; @@ -886,8 +888,10 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str, if (*str == '\0') return start; if (i_isdigit(*str)) { - num = num*10 + (*str-'0'); - continue; + if (!parse_uint(str, &endptr, 10, &num)) { + return start; + } + str = endptr; } if (*str != ';' && *str != 'm') @@ -958,8 +962,12 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str, /* ANSI indexed color or RGB color */ if (*str != ';') break; str++; - for (num2 = 0; i_isdigit(*str); str++) - num2 = num2*10 + (*str-'0'); + + if (!parse_uint(str, &endptr, 10, &num2)) { + return start; + } + str = endptr; + if (*str == '\0') return start; switch (num2) { @@ -1006,8 +1014,12 @@ static const char *get_ansi_color(THEME_REC *theme, const char *str, /* indexed */ if (*str != ';') break; str++; - for (num2 = 0; i_isdigit(*str); str++) - num2 = num2*10 + (*str-'0'); + + if (!parse_uint(str, &endptr, 10, &num2)) { + return start; + } + str = endptr; + if (*str == '\0') return start; if (num == 38) { |