From: krakjoe <joe.watkins@live.co.uk>
Date: Wed, 4 Dec 2013 23:26:14 +0000 (+0000)
Subject: don't use emalloc there
X-Git-Tag: php-5.6.0alpha1~110^2~29^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3341e219c9f8b9bb33499f2762103b24bf756da6;p=php

don't use emalloc there
---

diff --git a/phpdbg.c b/phpdbg.c
index 32cc0769f9..0dcd80e20c 100644
--- 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 2589a24732..a77d27d83e 100644
--- 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;