Use zend_string_alloc directly

Hasn't been tested so this is a shot in the dark

Author: Girgias

ext/pdo_dblib/dblib_driver.c

@@ -147,7 +147,6 @@ static zend_string* dblib_handle_quoter(pdo_dbh_t *dbh, const zend_string *unquo
 	pdo_dblib_db_handle *H = (pdo_dblib_db_handle *)dbh->driver_data;
 	zend_bool use_national_character_set = 0;
 	size_t i;
-	char *q, *quoted;
 	size_t quotedlen = 0;
 	zend_string *quoted_str;
 
@@ -171,26 +170,21 @@ static zend_string* dblib_handle_quoter(pdo_dbh_t *dbh, const zend_string *unquo
 	if (use_national_character_set) {
 		++quotedlen; /* N prefix */
 	}
-	q = quoted = emalloc(quotedlen + 1); /* Add byte for terminal null */
+	quoted_str = zend_string_alloc(quotedlen, 0);
 	if (use_national_character_set) {
-		*q++ = 'N';
+		*ZSTR_VAL(quoted_str)++ = 'N';
 	}
-	*q++ = '\'';
+	*ZSTR_VAL(quoted_str)++ = '\'';
 
 	for (i = 0; i < ZSTR_LEN(unquoted); i++) {
 		if (ZSTR_VAL(unquoted)[i] == '\'') {
-			*q++ = '\'';
-			*q++ = '\'';
+			*ZSTR_VAL(quoted_str)++ = '\'';
+			*ZSTR_VAL(quoted_str)++ = '\'';
 		} else {
-			*q++ = ZSTR_VAL(unquoted)[i];
+			*ZSTR_VAL(quoted_str)++ = ZSTR_VAL(unquoted)[i];
 		}
 	}
-	*q++ = '\'';
-
-	*q = 0;
-
-	quoted_str = zend_string_init(quoted, quotedlen, 0);
-	efree(quoted);
+	*ZSTR_VAL(quoted_str) = '\'';
 	return quoted_str;
 }
 

ext/pdo_firebird/firebird_driver.c

@@ -653,7 +653,6 @@ static zend_string* firebird_handle_quoter(pdo_dbh_t *dbh, const zend_string *un
 {
 	int qcount = 0;
 	char const *co, *l, *r;
-	char *c, *quoted;
 	size_t quotedlen;
 	zend_string *quoted_str;
 
@@ -666,24 +665,22 @@ static zend_string* firebird_handle_quoter(pdo_dbh_t *dbh, const zend_string *un
 	for (co = ZSTR_VAL(unquoted); (co = strchr(co,'\'')); qcount++, co++);
 
 	quotedlen = ZSTR_LEN(unquoted) + qcount + 2;
-	quoted = c = emalloc(quotedlen+1);
-	*c++ = '\'';
+	quoted_str = zend_string_alloc(quotedlen, 0);
+	*ZSTR_VAL(quoted_str)++ = '\'';
 
 	/* foreach (chunk that ends in a quote) */
 	for (l = ZSTR_VAL(unquoted); (r = strchr(l,'\'')); l = r+1) {
-		strncpy(c, l, r-l+1);
-		c += (r-l+1);
+		strncpy(ZSTR_VAL(quoted_str), l, r-l+1);
+		ZSTR_VAL(quoted_str) += (r-l+1);
 		/* add the second quote */
-		*c++ = '\'';
+		*ZSTR_VAL(quoted_str)++ = '\'';
 	}
 
 	/* copy the remainder */
-	strncpy(c, l, quotedlen-(c-quoted)-1);
-	quoted[quotedlen-1] = '\'';
-	quoted[quotedlen]   = '\0';
+	strncpy(ZSTR_VAL(quoted_str), l, quotedlen-(c-quoted)-1);
+	ZSTR_VAL(quoted_str)[quotedlen-1] = '\'';
+	ZSTR_VAL(quoted_str)[quotedlen]   = '\0';
 
-	quoted_str = zend_string_init(quoted, quotedlen, 0);
-	efree(quoted);
 	return quoted_str;
 }
 /* }}} */