pg_copy_from using zend_string on success.

Author: devnexen

ext/pgsql/pgsql.c

@@ -3269,22 +3269,28 @@ PHP_FUNCTION(pg_copy_from)
 				int command_failed = 0;
 				PQclear(pgsql_result);
 				ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pg_rows), value) {
+					zend_string *zquery = NULL;
 					zend_string *tmp = zval_try_get_string(value);
 					if (UNEXPECTED(!tmp)) {
 						return;
 					}
-					query = (char *)emalloc(ZSTR_LEN(tmp) + 2);
-					strlcpy(query, ZSTR_VAL(tmp), ZSTR_LEN(tmp) + 2);
-					if (ZSTR_LEN(tmp) > 0 && *(query + ZSTR_LEN(tmp) - 1) != '\n') {
-						strlcat(query, "\n", ZSTR_LEN(tmp) + 2);
+					zquery = zend_string_alloc(ZSTR_LEN(tmp) + 2, false);
+					if (UNEXPECTED(!zquery)) {
+						zend_string_release(tmp);
+						return;
+					}
+					memcpy(ZSTR_VAL(zquery), ZSTR_VAL(tmp), ZSTR_LEN(tmp) + 2);
+					ZSTR_VAL(zquery)[ZSTR_LEN(tmp) + 1] = 0;
+					if (ZSTR_LEN(zquery) > 0 && ZSTR_VAL(zquery)[ZSTR_LEN(tmp)]  != '\n') {
+						ZSTR_VAL(zquery)[ZSTR_LEN(tmp) ] = '\n';
 					}
-					if (PQputCopyData(pgsql, query, (int)strlen(query)) != 1) {
-						efree(query);
+					if (PQputCopyData(pgsql, ZSTR_VAL(tmp), ZSTR_LEN(tmp)) != 1) {
+						zend_string_release(zquery);
 						zend_string_release(tmp);
 						PHP_PQ_ERROR("copy failed: %s", pgsql);
 						RETURN_FALSE;
 					}
-					efree(query);
+					zend_string_release(zquery);
 					zend_string_release(tmp);
 				} ZEND_HASH_FOREACH_END();