clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't use emalloc there

Browse Source
This commit is contained in:
krakjoe 2013-12-04 23:26:14 +00:00
parent 1fb67f1eda
commit 3341e219c9
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpdbg.c
View File

@ -864,9 +864,13 @@ phpdbg_main:
} break;
case 'i': { /* set init file */
if (init_file) {
free(init_file);
}
init_file_len = strlen(php_optarg);
if (init_file_len) {
init_file = estrdup(php_optarg);
init_file = strdup(php_optarg);
}
} break;
@ -975,7 +979,7 @@ phpdbg_main:
memcpy(&ini_entries[ini_entries_len], ze, ze_len);
ini_entries_len += ze_len;
memcpy(&ini_entries[ini_entries_len], "\n", (sizeof("\n") - 1));
free(zend_extensions[zend_extension]);
zend_extension++;
}

7
phpdbg_prompt.c
View File

@ -149,7 +149,7 @@ next_line:
}
if (free_init) {
efree(init_file);
free(init_file);
}
}
} /* }}} */
@ -176,8 +176,9 @@ 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 = emalloc(strlen(scan_dir) + sizeof(PHPDBG_INIT_FILENAME));
sprintf(init_file, "%s/%s", scan_dir, PHPDBG_INIT_FILENAME);
asprintf(
&init_file, "%s/%s", scan_dir, PHPDBG_INIT_FILENAME);
phpdbg_try_file_init(init_file, strlen(init_file), 1 TSRMLS_CC);
if (i == -1) {
break;