Refactor php_pgsql_add_quotes()

Author: Girgias

ext/pgsql/pgsql.c

@@ -4510,25 +4510,23 @@ static int php_pgsql_convert_match(const zend_string *str, const char *regex , s
 /* {{{ php_pgsql_add_quote
  * add quotes around string.
  */
-static int php_pgsql_add_quotes(zval *src, bool should_free)
+static zend_string* php_pgsql_add_quotes(zend_string *src)
 {
 	smart_str str = {0};
-
-	assert(Z_TYPE_P(src) == IS_STRING);
-	assert(should_free == 1 || should_free == 0);
+	zend_string *result;
 
 	smart_str_appendc(&str, 'E');
 	smart_str_appendc(&str, '\'');
-	smart_str_appendl(&str, Z_STRVAL_P(src), Z_STRLEN_P(src));
+	smart_str_append(&str, src);
 	smart_str_appendc(&str, '\'');
 	smart_str_0(&str);
 
-	if (should_free) {
-		zval_ptr_dtor(src);
-	}
-	ZVAL_NEW_STR(src, str.s);
+	result = zend_string_dup(str.s, false);
+	/* Free source and smart string */
+	zend_string_release(src);
+	smart_str_free(&str);
 
-	return SUCCESS;
+	return result;
 }
 /* }}} */
 
@@ -4741,8 +4739,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 								if (php_pgsql_convert_match(Z_STR_P(val), REGEX1, sizeof(REGEX1)-1, 1) == FAILURE) {
 									err = 1;
 								} else {
-									ZVAL_STRING(&new_val, Z_STRVAL_P(val));
-									php_pgsql_add_quotes(&new_val, 1);
+									ZVAL_STR(&new_val, php_pgsql_add_quotes(Z_STR_P(val)));
 								}
 							}
 							else {
@@ -4809,8 +4806,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 							/* better to use PGSQLescapeLiteral since PGescapeStringConn does not handle special \ */
 							ZSTR_LEN(str) = PQescapeStringConn(pg_link, ZSTR_VAL(str), Z_STRVAL_P(val), Z_STRLEN_P(val), NULL);
 							str = zend_string_truncate(str, ZSTR_LEN(str), 0);
-							ZVAL_NEW_STR(&new_val, str);
-							php_pgsql_add_quotes(&new_val, 1);
+							ZVAL_STR(&new_val, php_pgsql_add_quotes(str));
 						}
 						break;
 
@@ -4896,8 +4892,9 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 								err = 1;
 							}
 							else {
-								ZVAL_STRINGL(&new_val, Z_STRVAL_P(val), Z_STRLEN_P(val));
-								php_pgsql_add_quotes(&new_val, 1);
+								zend_string *tmp_zstr = php_pgsql_add_quotes(Z_STR_P(val));
+								ZVAL_STRINGL(&new_val, ZSTR_VAL(tmp_zstr), ZSTR_LEN(tmp_zstr));
+								zend_string_release(tmp_zstr);
 							}
 #undef REGEX0
 #undef REGEX1
@@ -4932,8 +4929,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 							if (php_pgsql_convert_match(Z_STR_P(val), REGEX0, sizeof(REGEX0)-1, 1) == FAILURE) {
 								err = 1;
 							} else {
-								ZVAL_STRING(&new_val, Z_STRVAL_P(val));
-								php_pgsql_add_quotes(&new_val, 1);
+								ZVAL_STR(&new_val, php_pgsql_add_quotes(Z_STR_P(val)));
 							}
 #undef REGEX0
 						}
@@ -4965,8 +4961,9 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 								err = 1;
 							}
 							else {
-								ZVAL_STRINGL(&new_val, Z_STRVAL_P(val), Z_STRLEN_P(val));
-								php_pgsql_add_quotes(&new_val, 1);
+								zend_string *tmp_zstr = php_pgsql_add_quotes(Z_STR_P(val));
+								ZVAL_STRINGL(&new_val, ZSTR_VAL(tmp_zstr), ZSTR_LEN(tmp_zstr));
+								zend_string_release(tmp_zstr);
 							}
 #undef REGEX0
 						}
@@ -4998,8 +4995,9 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 								err = 1;
 							}
 							else {
-								ZVAL_STRINGL(&new_val, Z_STRVAL_P(val), Z_STRLEN_P(val));
-								php_pgsql_add_quotes(&new_val, 1);
+								zend_string *tmp_zstr = php_pgsql_add_quotes(Z_STR_P(val));
+								ZVAL_STRINGL(&new_val, ZSTR_VAL(tmp_zstr), ZSTR_LEN(tmp_zstr));
+								zend_string_release(tmp_zstr);
 							}
 #undef REGEX0
 						}
@@ -5077,8 +5075,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 								err = 1;
 							}
 							else {
-								ZVAL_STRING(&new_val, Z_STRVAL_P(val));
-								php_pgsql_add_quotes(&new_val, 1);
+								ZVAL_STR(&new_val, php_pgsql_add_quotes(Z_STR_P(val)));
 							}
 #undef REGEX0
 						}
@@ -5105,14 +5102,16 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 						else {
 							unsigned char *tmp;
 							size_t to_len;
+							zend_string *tmp_zstr;
 							smart_str s = {0};
 							tmp = PQescapeByteaConn(pg_link, (unsigned char *)Z_STRVAL_P(val), Z_STRLEN_P(val), &to_len);
-							ZVAL_STRINGL(&new_val, (char *)tmp, to_len - 1); /* PQescapeBytea's to_len includes additional '\0' */
+							tmp_zstr = zend_string_init((char *)tmp, to_len - 1, false); /* PQescapeBytea's to_len includes additional '\0' */
 							PQfreemem(tmp);
-							php_pgsql_add_quotes(&new_val, 1);
-							smart_str_appendl(&s, Z_STRVAL(new_val), Z_STRLEN(new_val));
+							/* tmp_zstr is freed by php_pgsql_add_quotes() */
+							tmp_zstr = php_pgsql_add_quotes(tmp_zstr);
+							smart_str_append(&s, tmp_zstr);
 							smart_str_0(&s);
-							zval_ptr_dtor(&new_val);
+							zend_string_release(tmp_zstr);
 							ZVAL_NEW_STR(&new_val, s.s);
 						}
 						break;
@@ -5151,8 +5150,9 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 								err = 1;
 							}
 							else {
-								ZVAL_STRINGL(&new_val, Z_STRVAL_P(val), Z_STRLEN_P(val));
-								php_pgsql_add_quotes(&new_val, 1);
+								zend_string *tmp_zstr = php_pgsql_add_quotes(Z_STR_P(val));
+								ZVAL_STRINGL(&new_val, ZSTR_VAL(tmp_zstr), ZSTR_LEN(tmp_zstr));
+								zend_string_release(tmp_zstr);
 							}
 #undef REGEX0
 						}