diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | string.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Jul 15 22:05:13 2016 Naohisa Goto <ngotogenome@gmail.com> + + * string.c (str_buf_cat): Fix potential interger overflow of capa. + In addition, termlen is used instead of +1. + Fri Jul 15 21:30:38 2016 Naohisa Goto <ngotogenome@gmail.com> * string.c (str_buf_cat): Fix capa size for embed string. @@ -2562,6 +2562,7 @@ str_buf_cat(VALUE str, const char *ptr, long len) long capa, total, olen, off = -1; char *sptr; const int termlen = TERM_LEN(str); + assert(termlen < RSTRING_EMBED_LEN_MAX + 1); /* < (LONG_MAX/2) */ RSTRING_GETMEM(str, sptr, olen); if (ptr >= sptr && ptr <= sptr + olen) { @@ -2586,11 +2587,11 @@ str_buf_cat(VALUE str, const char *ptr, long len) if (capa <= total) { if (LIKELY(capa > 0)) { while (total > capa) { - if (capa > LONG_MAX / 2) { + if (capa > LONG_MAX / 2 - termlen) { capa = (total + 4095) / 4096 * 4096; break; } - capa = 2 * capa + 1; + capa = 2 * capa + termlen; /* == 2*(capa+termlen)-termlen */ } } else { |