diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2013-11-25 17:58:43 +0000 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2013-11-25 17:58:43 +0000 |
| commit | 7ac64cdf46bc70a14dd9fabaa663ecae41e93322 (patch) | |
| tree | 920191983482e7784c5a6d8ef78da7b37f5b0cec | |
| parent | 19b1f7b5f988ef1c0e42f45718fc2c54c1c978a5 (diff) | |
| parent | be8adbb231f7c7a70c8b12d032c028dd8d954e8d (diff) | |
| download | php-git-7ac64cdf46bc70a14dd9fabaa663ecae41e93322.tar.gz | |
Merge branch 'master' of https://github.com/krakjoe/phpdbg
| -rw-r--r-- | phpdbg.c | 2 | ||||
| -rw-r--r-- | phpdbg_prompt.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -652,7 +652,7 @@ phpdbg_main: case 'i': { /* set init file */ init_file_len = strlen(php_optarg); if (init_file_len) { - init_file = strdup(php_optarg); + init_file = estrdup(php_optarg); } } break; diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index 5db26dbf3f..679f52f95b 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -149,7 +149,7 @@ next_line: } if (free_init) { - free(init_file); + efree(init_file); } } } /* }}} */ @@ -176,7 +176,7 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default TS if (i != -1) { scan_dir[i] = 0; } - init_file = malloc(strlen(scan_dir) + sizeof(PHPDBG_INIT_FILENAME)); + init_file = emalloc(strlen(scan_dir) + sizeof(PHPDBG_INIT_FILENAME)); sprintf(init_file, "%s/%s", scan_dir, PHPDBG_INIT_FILENAME); phpdbg_try_file_init(init_file, strlen(init_file), 1 TSRMLS_CC); if (i == -1) { |