Fix segfault in source command

diff --git a/phpdbg.c b/phpdbg.c
index d790f9d0f3f5e818bf8d0ded7537b7597b98cad9..ebe7cafb7b4e42b1a92d0fa444a7713d874f6594 100644 (file)
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -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 84b183892964713a22e16e677dfda0d969bf74a7..0e79e51cc6f03bc82ca9a376bfd32290bdf97f94 100644 (file)
--- 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) {