php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 20:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault in source command

Browse Source
This commit is contained in:
Bob Weinand
2013-11-25 18:58:03 +01:00
parent 781bd90de3
commit be8adbb231
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpdbg.c
View File

@@ -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;

4
phpdbg_prompt.c
View File

@@ -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) {