com php-src: Merge branch 'PHP-7.1': sapi/phpdbg/phpdbg_promp t.c

Commit: d4dd540233012f9379313a4611f805c41fbf2d50 Author: Bob Weinand <bobwei9@hotmail.com> Wed, 25 Jan 2017 13:01:48 +0100 Parents: e7166d170833319b2f1e5e5808191c440206651b d0272ef1ef262ad4103586bdba468586e33b5f56 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d4dd540233012f9379313a4611f805c41fbf2d50 Log: Merge branch 'PHP-7.1' Changed paths: MM sapi/phpdbg/phpdbg_prompt.c Diff: diff --cc sapi/phpdbg/phpdbg_prompt.c index 4025ad2,d6d0f92..0552101 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@@ -608,11 -611,11 +608,11 @@@ int phpdbg_compile(void) /* {{{ * zend_hash_del(&PHPDBG_G(file_sources), PHPDBG_G(ops)->filename); PHPDBG_G(file_sources).pDestructor = dtor; - data = erealloc(data, sizeof(phpdbg_file_source) + sizeof(uint) * ++data->lines); - memmove(data->line + 1, data->line, sizeof(uint) * data->lines); + data = erealloc(data, sizeof(phpdbg_file_source) + sizeof(uint32_t) * ++data->lines); + memmove(data->line + 1, data->line, sizeof(uint32_t) * data->lines); data->line[0] = 0; data->buf = erealloc(data->buf, data->len + start_line_len); - memmove(data->buf + start_line_len, data->buf, data->len * sizeof(uint32_t)); + memmove(data->buf + start_line_len, data->buf, data->len); memcpy(data->buf, start_line, start_line_len); efree(start_line); data->len += start_line_len;