diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-07-24 17:17:09 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-07-24 17:17:26 +0200 |
| commit | 13525328ede9db6f8235b4e7f91f7bce80235880 (patch) | |
| tree | 8f41b6e661f9b6e9eca9c93dc4e1690fc4bcf7a5 /sapi/phpdbg/phpdbg_utils.c | |
| parent | bf1ecbfe168e0f59c0deacbf7f2012c0d36a7f08 (diff) | |
| download | php-git-13525328ede9db6f8235b4e7f91f7bce80235880.tar.gz | |
Cleanup shutdown, enable proper memory leak displaying
phpdbg should not memory leak...
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 2e1e1ed70c..4d45066cfa 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -166,16 +166,20 @@ PHPDBG_API const char *phpdbg_current_file(void) /* {{{ */ PHPDBG_API const zend_function *phpdbg_get_function(const char *fname, const char *cname) /* {{{ */ { zend_function *func = NULL; - zend_string *lfname = zend_string_alloc(strlen(fname), 0); - memcpy(ZSTR_VAL(lfname), zend_str_tolower_dup(fname, ZSTR_LEN(lfname)), ZSTR_LEN(lfname) + 1); + zend_string *lfname = zend_string_init(fname, strlen(fname), 0); + zend_string *tmp = zend_string_tolower(lfname); + zend_string_release(lfname); + lfname = tmp; if (cname) { zend_class_entry *ce; - zend_string *lcname = zend_string_alloc(strlen(cname), 0); - memcpy(ZSTR_VAL(lcname), zend_str_tolower_dup(cname, ZSTR_LEN(lcname)), ZSTR_LEN(lcname) + 1); + zend_string *lcname = zend_string_init(cname, strlen(cname), 0); + tmp = zend_string_tolower(lcname); + zend_string_release(lcname); + lcname = tmp; ce = zend_lookup_class(lcname); - efree(lcname); + zend_string_release(lcname); if (ce) { func = zend_hash_find_ptr(&ce->function_table, lfname); @@ -184,7 +188,7 @@ PHPDBG_API const zend_function *phpdbg_get_function(const char *fname, const cha func = zend_hash_find_ptr(EG(function_table), lfname); } - efree(lfname); + zend_string_release(lfname); return func; } /* }}} */ |