Skip to content

Fix memory leaks when user functions misbehave and return different types #219

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

Merged
rtheunissen merged 1 commit into from
Oct 17, 2025
Merged

Fix memory leaks when user functions misbehave and return different types #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions src/ds/ds_htable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,16 @@ static inline bool implements_hashable(zval *key) {
#else
zend_call_method_with_1_params(a, Z_OBJCE_P(a), NULL, "equals", &equals, b);
#endif
return Z_TYPE(equals) == IS_TRUE;
}
switch (Z_TYPE(equals)) {
case IS_TRUE:
return true;
case IS_FALSE:
return false;
default:
zval_ptr_dtor(&equals);
return false;
}
}
}

static inline bool key_is_identical(zval *key, zval *other)
Expand Down Expand Up @@ -540,7 +548,8 @@ static int user_compare_by_value(const void *a, const void *b)
DSG(user_compare_fci).retval = &retval;

if (zend_call_function(&DSG(user_compare_fci), &DSG(user_compare_fci_cache)) == SUCCESS) {
return zval_get_long(&retval);
convert_to_long(&retval);
return Z_LVAL(retval);
}

return 0;
Expand All @@ -559,7 +568,8 @@ static int user_compare_by_key(const void *a, const void *b)
DSG(user_compare_fci).retval = &retval;

if (zend_call_function(&DSG(user_compare_fci), &DSG(user_compare_fci_cache)) == SUCCESS) {
return zval_get_long(&retval);
convert_to_long(&retval);
return Z_LVAL(retval);
}

return 0;
Expand Down
Loading