diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2016-09-14 13:44:51 +0200 |
|---|---|---|
| committer | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2016-09-14 13:47:24 +0200 |
| commit | 9de7a9b3284b06631a47609a83e608cfe0541de1 (patch) | |
| tree | ef22bb3e52f089c4ab6efae5f083d74b8d889954 /src | |
| parent | 52fedeaf0229e27f9d86b72b23f16120c92c1fea (diff) | |
| download | irssi-9de7a9b3284b06631a47609a83e608cfe0541de1.zip | |
Merge branch 'quarkslab'
Diffstat (limited to 'src')
| -rw-r--r-- | src/fe-common/core/formats.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index ccf48394..d9a51201 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -131,6 +131,8 @@ void unformat_24bit_color(char **ptr, int off, int *fgcolor, int *bgcolor, int * unsigned char rgbx[4]; unsigned int i; for (i = 0; i < 4; ++i) { + if ((*ptr)[i + off] == '\0') + return; rgbx[i] = (*ptr)[i + off]; } rgbx[3] -= 0x20; @@ -1357,6 +1359,9 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) bgcolor = *ptr==(char)0xff ? -1 : *ptr-'0'; } } + if (*ptr == '\0') + break; + ptr++; break; case 6: |