MFH Add asprintf, use regular system malloc and free and add checks in configure.in for the functions

1 files changed, 14 insertions, 2 deletions

diff --git a/main/snprintf.c b/main/snprintf.c
index dbe7b10023..ac53a89303 100644
--- a/main/snprintf.c
+++ b/main/snprintf.c
@@ -1280,9 +1280,9 @@ PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap) /* {{{ *
 	*buf = NULL;
 
 	if (cc >= 0) {
-		if ((*buf = emalloc(++cc)) != NULL) {
+		if ((*buf = malloc(++cc)) != NULL) {
 			if ((cc = ap_php_vsnprintf(*buf, cc, format, ap)) < 0) {
-				efree(*buf);
+				free(*buf);
 				*buf = NULL;
 			}
 		}
@@ -1292,6 +1292,18 @@ PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap) /* {{{ *
 }
 /* }}} */
 
+PHPAPI int ap_php_asprintf(char **buf, const char *format, ...) /* {{{ */
+{
+	int cc;
+	va_list ap;
+
+	va_start(ap, format);
+	cc = vasprintf(buf, format, ap);
+	va_end(ap);
+	return cc;
+}
+/* }}} */
+
 /*
  * Local variables:
  * tab-width: 4