Skip to content

More tests pass now #163

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
merged 11 commits into from
Feb 4, 2015
Merged

More tests pass now #163

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
399b86b
More tests pass now
rlerdorf Feb 3, 2015
479b6e2
Fix 4 more tests
rlerdorf Feb 3, 2015
3a93af3
minor cleanup
rlerdorf Feb 3, 2015
a3279a8
Various bug fixes
laruence Feb 4, 2015
35a543f
Fixed memory leak
laruence Feb 4, 2015
cbcbece
Fixed getStat
laruence Feb 4, 2015
6851bdd
Fixed memory leak
laruence Feb 4, 2015
229c684
Better implementation
laruence Feb 4, 2015
1b2c225
Fixed memleak, and use the recently added object_size api
laruence Feb 4, 2015
e4f8f39
Down to 18 failed tests now
rlerdorf Feb 4, 2015
1bb38ab
Oops, need this for the inline stuff
rlerdorf Feb 4, 2015
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
Prev Previous commit
Next Next commit
Fixed memleak, and use the recently added object_size api
  • Loading branch information
@laruence @rlerdorf
laruence authored and rlerdorf committed Feb 4, 2015
commit 1b2c2251f954d785c6ef9e05a8153eba69b96573
9 changes: 5 additions & 4 deletions php_memcached.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
size_t key_lens[1] = { 0 };
zval *cas_token = NULL;
zval *udf_flags = NULL;
uint64_t orig_cas_flag;
zend_fcall_info fci = empty_fcall_info;
zend_fcall_info_cache fcc = empty_fcall_info_cache;
memcached_result_st result;
Expand Down Expand Up @@ -575,7 +576,6 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
keys[0] = key->val;
key_lens[0] = key->len;

uint64_t orig_cas_flag;
orig_cas_flag = memcached_behavior_get(m_obj->memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS);

/*
Expand Down Expand Up @@ -612,6 +612,8 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
* ourselves.
*/
if (cas_token) {
ZVAL_DEREF(cas_token);
zval_ptr_dtor(cas_token);
ZVAL_DOUBLE(cas_token, 0.0);
}

Expand Down Expand Up @@ -653,8 +655,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)

if (cas_token) {
ZVAL_DEREF(cas_token);
SEPARATE_ZVAL(cas_token);
zval_dtor(cas_token);
zval_ptr_dtor(cas_token);
ZVAL_DOUBLE(cas_token, (double)cas);
}

Expand Down Expand Up @@ -2839,7 +2840,7 @@ static void php_memc_free_storage(zend_object *obj)

zend_object *php_memc_new(zend_class_entry *ce)
{
php_memc_t *i_obj = ecalloc(1, sizeof(php_memc_t) + sizeof(zval) * (ce->default_properties_count - 1));
php_memc_t *i_obj = ecalloc(1, sizeof(php_memc_t) + zend_object_properties_size(ce));

zend_object_std_init(&i_obj->zo, ce);
object_properties_init(&i_obj->zo, ce);
Expand Down