[php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5
| From: | David Carlier | Date: | Thu, 15 Oct 2026 02:44:38 +0000 |
| Subject: | [php-src] PHP-8.6: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-142299@lists.php.net to get a copy of this message | ||
Author: David Carlier (devnexen)
Date: 2026-10-15T03:44:03+01:00
Commit: https://github.com/php/php-src/commit/0b982635717b94bcd326a2a9952bac8d4c4f0341
Raw diff: https://github.com/php/php-src/commit/0b982635717b94bcd326a2a9952bac8d4c4f0341.diff
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Zend: zend_call_stack_get_netbsd_pthread() pthread attribute leak.
Changed paths:
M Zend/zend_call_stack.c
Diff:
diff --git a/Zend/zend_call_stack.c b/Zend/zend_call_stack.c
index ed86ecc74a23..53eb4f5ac3ad 100644
--- a/Zend/zend_call_stack.c
+++ b/Zend/zend_call_stack.c
@@ -590,11 +590,13 @@ static bool zend_call_stack_get_netbsd_pthread(zend_call_stack *stack)
error = pthread_attr_getstack(&attr, &addr, &max_size);
if (error) {
+ pthread_attr_destroy(&attr);
return false;
}
error = pthread_attr_getguardsize(&attr, &guard_size);
if (error) {
+ pthread_attr_destroy(&attr);
return false;
}
@@ -604,6 +606,7 @@ static bool zend_call_stack_get_netbsd_pthread(zend_call_stack *stack)
stack->base = (char *)addr + max_size;
stack->max_size = max_size;
+ pthread_attr_destroy(&attr);
return true;
}
# else