php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3'

Browse Source 
* PHP-8.3:
  Fix GH-15628: php_stream_memory_get_buffer() not zero-terminated
This commit is contained in:
Christoph M. Becker
2024-09-01 14:57:55 +02:00
parent a57ce052cd 5f504f10dd
commit 55f519b178
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@@ -27,7 +27,11 @@ PHP NEWS
- PDO_Firebird:
. Fixed GH-15604 (Always make input parameters nullable). (sim1984)
27 Aug 2024, PHP 8.4.0beta4
- Streams:
. Fixed bug GH-15628 (php_stream_memory_get_buffer() not zero-terminated).
(cmb)
29 Aug 2024, PHP 8.4.0beta4
- Core:
. Fixed bug GH-15408 (MSan false-positve on zend_max_execution_timer).

2
main/streams/memory.c
View File

@@ -66,6 +66,7 @@ static ssize_t php_stream_memory_write(php_stream *stream, const char *buf, size
if (count) {
ZEND_ASSERT(buf != NULL);
memcpy(ZSTR_VAL(ms->data) + ms->fpos, (char*) buf, count);
ZSTR_VAL(ms->data)[ZSTR_LEN(ms->data)] = '\0';
ms->fpos += count;
}
return count;
@@ -241,6 +242,7 @@ static int php_stream_memory_set_option(php_stream *stream, int option, int valu
size_t old_size = ZSTR_LEN(ms->data);
ms->data = zend_string_realloc(ms->data, newsize, 0);
memset(ZSTR_VAL(ms->data) + old_size, 0, newsize - old_size);
ZSTR_VAL(ms->data)[ZSTR_LEN(ms->data)] = '\0';
}
return PHP_STREAM_OPTION_RETURN_OK;
}