Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Php7.3 #74

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Php7.3 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2fcff3
php7.3 compatibility with php7.3
dvenckusvh Jan 18, 2020
57a4a6d
php7.3 correct missing 'break;' stmt
dvenckusvh Jan 18, 2020
c2341a6
php7.3 include additional files to ignore from build
dvenckusvh Jan 18, 2020
02e5d67
php7.3 re-instate conversion array/obj recursion protection (compat 7.3)
dvenckusvh Jan 18, 2020
755a6d4
php7.3 add missed function declarations
dvenckusvh Jan 18, 2020
4a95128
php7.3 dagnabbit!
dvenckusvh Jan 18, 2020
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ mkinstalldirs
modules/
run-tests.php
*.lo
/apm.ini.*
/config.log
/configure.ac
107 changes: 87 additions & 20 deletions backtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@

ZEND_DECLARE_MODULE_GLOBALS(apm);

inline static zend_bool php_apm_zend_hash_apply_protection_begin(HashTable* ht);
inline static zend_bool php_apm_zend_hash_apply_protection_end(HashTable* ht);
static void debug_print_backtrace_args(zval *arg_array TSRMLS_DC, smart_str *trace_str);
static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char depth);
static void append_flat_hash(HashTable *ht TSRMLS_DC, smart_str *trace_str, char is_object, char depth);
Expand All @@ -42,6 +44,69 @@ static zval *debug_backtrace_get_args(void ***curpos TSRMLS_DC);
static int append_variable(zval *expr, smart_str *trace_str);
static char *apm_addslashes(char *str, uint length, int *new_length);


#ifdef ZEND_HASH_GET_APPLY_COUNT /* PHP 7.2 or earlier recursion protection */


inline static zend_bool php_apm_zend_hash_apply_protection_begin(HashTable* ht)
{
if (!ht) {
return 1;
}
if (ZEND_HASH_GET_APPLY_COUNT(ht) > 0) {
return 0;
}
if (ZEND_HASH_APPLY_PROTECTION(ht)) {
ZEND_HASH_INC_APPLY_COUNT(ht);
}
return 1;
}

inline static zend_bool php_apm_zend_hash_apply_protection_end(HashTable* ht)
{
if (!ht) {
return 1;
}
if (ZEND_HASH_GET_APPLY_COUNT(ht) == 0) {
return 0;
}
if (ZEND_HASH_APPLY_PROTECTION(ht)) {
ZEND_HASH_DEC_APPLY_COUNT(ht);
}
return 1;
}


#else /* PHP 7.3 or later */

inline static zend_bool php_apm_zend_hash_apply_protection_begin(zend_array* ht)
{
if (GC_IS_RECURSIVE(ht)) {
return 0;
}
if (!(GC_FLAGS(ht) & GC_IMMUTABLE)) {
GC_PROTECT_RECURSION(ht);
}
return 1;
}

inline static zend_bool php_apm_zend_hash_apply_protection_end(zend_array* ht)
{
if (!GC_IS_RECURSIVE(ht)) {
return 0;
}
if (!(GC_FLAGS(ht) & GC_IMMUTABLE)) {
GC_UNPROTECT_RECURSION(ht);
}
return 1;
}

#endif





void append_backtrace(smart_str *trace_str TSRMLS_DC)
{
/* backtrace variables */
Expand Down Expand Up @@ -387,28 +452,14 @@ static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char
#endif
case IS_ARRAY:
smart_str_appendc(trace_str, '[');
#if PHP_VERSION_ID >= 70000
if (ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(expr)) && ++Z_ARRVAL_P(expr)->u.v.nApplyCount>1) {
#else
if (++Z_ARRVAL_P(expr)->nApplyCount>1) {
#endif
if ( php_apm_zend_hash_apply_protection_begin(Z_ARRVAL_P(expr)) ) {
smart_str_appendl(trace_str, " *RECURSION*", sizeof(" *RECURSION*") - 1);
#if PHP_VERSION_ID >= 70000
Z_ARRVAL_P(expr)->u.v.nApplyCount--;
#else
Z_ARRVAL_P(expr)->nApplyCount--;
#endif
php_apm_zend_hash_apply_protection_end(Z_ARRVAL_P(expr));
return;
}
append_flat_hash(Z_ARRVAL_P(expr) TSRMLS_CC, trace_str, 0, depth + 1);
smart_str_appendc(trace_str, ']');
#if PHP_VERSION_ID >= 70000
if (ZEND_HASH_APPLY_PROTECTION(Z_ARRVAL_P(expr))) {
Z_ARRVAL_P(expr)->u.v.nApplyCount--;
}
#else
Z_ARRVAL_P(expr)->nApplyCount--;
#endif
php_apm_zend_hash_apply_protection_end(Z_ARRVAL_P(expr));
break;
case IS_OBJECT:
{
Expand All @@ -419,10 +470,15 @@ static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char
smart_str_appendl(trace_str, " Object (", sizeof(" Object (") - 1);
zend_string_release(class_name);

#ifdef Z_IS_RECURSIVE_P
if (Z_IS_RECURSIVE_P(expr)) {
#else
if (Z_OBJ_APPLY_COUNT_P(expr) > 0) {
#endif
smart_str_appendl(trace_str, " *RECURSION*", sizeof(" *RECURSION*") - 1);
return;
}

#else
char *class_name = NULL;
zend_uint clen;
Expand All @@ -439,12 +495,17 @@ static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char
efree(class_name);
}
#endif

if (Z_OBJ_HANDLER_P(expr, get_properties)) {
properties = Z_OBJPROP_P(expr);
}
if (properties) {
#if PHP_VERSION_ID >= 70000
Z_OBJ_INC_APPLY_COUNT_P(expr);
#ifdef Z_IS_RECURSIVE_P
Z_PROTECT_RECURSION_P(expr);
#else
Z_OBJ_INC_APPLY_COUNT_P(expr);
#endif
#else
if (++properties->nApplyCount>1) {
smart_str_appendl(trace_str, " *RECURSION*", sizeof(" *RECURSION*") - 1);
Expand All @@ -454,10 +515,14 @@ static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char
#endif
append_flat_hash(properties TSRMLS_CC, trace_str, 1, depth + 1);
#if PHP_VERSION_ID >= 70000
Z_OBJ_DEC_APPLY_COUNT_P(expr);
#ifdef Z_IS_RECURSIVE_P
Z_UNPROTECT_RECURSION_P(expr);
#else
Z_OBJ_DEC_APPLY_COUNT_P(expr);
#endif
#else
properties->nApplyCount--;
#endif
#endif
}
smart_str_appendc(trace_str, ')');
break;
Expand All @@ -468,6 +533,8 @@ static void append_flat_zval_r(zval *expr TSRMLS_DC, smart_str *trace_str, char
}
}



static void append_flat_hash(HashTable *ht TSRMLS_DC, smart_str *trace_str, char is_object, char depth)
{
int i = 0;
Expand Down