Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ PHP NEWS
- PGSQL:
. Fixed pg_lo_write() rejecting data containing null bytes. (Ilia Alshanetsky)

- phpdbg:
. Fixed bug GH-13230 (use-after-free at phpdbg shutdown). (Ilia Alshanetsky)

- Posix:
. Reverted the validity check on the flags argument of posix_access().
(David Carlier)
Expand Down
4 changes: 4 additions & 0 deletions sapi/phpdbg/phpdbg_watch.c
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,9 @@ void phpdbg_remove_watch_element(phpdbg_watch_element *element) {
}

void phpdbg_backup_watch_element(phpdbg_watch_element *element) {
if (!element->watch) {
return;
}
memcpy(&element->backup, &element->watch->backup, /* element->watch->size */ sizeof(element->backup));
}

Expand Down Expand Up @@ -1097,6 +1100,7 @@ void phpdbg_clean_watch_element(phpdbg_watch_element *element) {
if (zend_hash_num_elements(elements) == 0) {
phpdbg_remove_watchpoint(element->watch);
}
element->watch = NULL;
}
}

Expand Down
6 changes: 0 additions & 6 deletions sapi/phpdbg/tests/bug73927.phpt
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
--TEST--
Bug #73927 (phpdbg fails with windows error prompt at "watch array")
--SKIPIF--
<?php
if (getenv('SKIP_ASAN')) {
die("skip intentionally causes segfaults");
}
?>
--PHPDBG--
b 19
r
Expand Down
Loading