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

Fix two possible crashes. Latter is unlikely unless you are doing scary

Browse Source 
things, but former looks nasty.
This commit is contained in:
Wez Furlong
2004-07-27 01:33:25 +00:00
parent f5ddb60764
commit 03e298ec47
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_builtin_functions.c
View File

@@ -671,9 +671,10 @@ ZEND_FUNCTION(get_class_vars)
if (zend_lookup_class(Z_STRVAL_PP(class_name), Z_STRLEN_PP(class_name), &pce TSRMLS_CC) == FAILURE) {
RETURN_FALSE;
} else {
int count = zend_hash_num_elements(&ce->default_properties);
int count;
ce = *pce;
count = zend_hash_num_elements(&ce->default_properties);
array_init(return_value);
if (count > 0) {
@@ -1680,6 +1681,11 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last TSRML
/* i know this is kinda ugly, but i'm trying to avoid extra cycles in the main execution loop */
zend_bool build_filename_arg = 1;
if (!ptr->opline) {
/* can happen when calling eval from a custom sapi */
function_name = "unknown";
build_filename_arg = 0;
} else
switch (ptr->opline->op2.u.constant.value.lval) {
case ZEND_EVAL:
function_name = "eval";