don't use emalloc there

diff --git a/phpdbg.c b/phpdbg.c
index 32cc0769f9d7cd8db9ba6878ea66fe7203a2cdbc..0dcd80e20c190544817ff100ff543be4f68a3fe0 100644 (file)
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -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++;
                }

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 2589a247322a47a48aee6e8c5d556ac65fdbcb63..a77d27d83ebf53e9455b907909d706cd97218172 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -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;