archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Just always copy the buffer, that makes it much safer

Browse source 
At least compared to conditionally using the mmap()ped input
This commit is contained in:
Bob Weinand 2015-07-25 19:50:31 +02:00
parent cdde4c51e1
commit 66fd52939b
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sapi/phpdbg/phpdbg_list.c
View file

@ -240,24 +240,16 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) {
char *bufptr, *endptr;
char resolved_path_buf[MAXPATHLEN];
if (zend_stream_fixup(file, &data.buf, &data.len) == FAILURE) {
if (zend_stream_fixup(file, &bufptr, &data.len) == FAILURE) {
return NULL;
}
data.buf = emalloc(data.len + 1);
memcpy(data.buf, bufptr, data.len);
data.buf[data.len] = 0;
data.filename = filename;
data.line[0] = 0;
if (file->handle.stream.mmap.old_closer) {
/* do not unmap */
file->handle.stream.closer = file->handle.stream.mmap.old_closer;
}
#if HAVE_MMAP
if (file->type == ZEND_HANDLE_MAPPED) {
data.map = file->handle.stream.handle;
}
#endif
fake.type = ZEND_HANDLE_MAPPED;
fake.handle.stream.mmap.buf = data.buf;
fake.handle.stream.mmap.len = data.len;
@ -282,6 +274,7 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) {
ret = PHPDBG_G(compile_file)(&fake, type);
if (ret == NULL) {
efree(data.buf);
efree(dataptr);
return NULL;
}
@ -333,11 +326,6 @@ zend_op_array *phpdbg_init_compile_file(zend_file_handle *file, int type) {
void phpdbg_free_file_source(zval *zv) {
phpdbg_file_source *data = Z_PTR_P(zv);
#if HAVE_MMAP
if (data->map) {
php_stream_mmap_unmap(data->map);
} else
#endif
if (data->buf) {
efree(data->buf);
}