Refactor bound_param_map to point to a zend_string*

Author: Girgias

ext/pdo/pdo_sql_parser.re

@@ -77,7 +77,7 @@ struct placeholder {
 };
 
 static void free_param_name(zval *el) {
-	efree(Z_PTR_P(el));
+	zend_string_release_ex(Z_PTR_P(el), 0);
 }
 
 PDO_API int pdo_parse_params(pdo_stmt_t *stmt, zend_string *inquery, zend_string **outquery)
@@ -359,20 +359,22 @@ rewrite:
 
 		for (plc = placeholders; plc; plc = plc->next) {
 			int skip_map = 0;
-			char *p;
+			zend_string *p;
 			zend_string *idxbuf;
+			zend_string *name_str;
 
 			if (plc->bindno == PDO_PARSER_BINDNO_ESCAPED_CHAR) {
 				continue;
 			}
 
 			name = estrndup(plc->pos, plc->len);
+			name_str = zend_string_init(name, plc->len, 0);
 
 			/* check if bound parameter is already available */
-			if (!strcmp(name, "?") || (p = zend_hash_str_find_ptr(stmt->bound_param_map, name, plc->len)) == NULL) {
+			if (!strcmp(name, "?") || (p = zend_hash_find_ptr(stmt->bound_param_map, name_str)) == NULL) {
 				idxbuf = zend_strpprintf(0, tmpl, bind_no++);
 			} else {
-				idxbuf = zend_string_init(p, strlen(p), 0);
+				idxbuf = p;
 				skip_map = 1;
 			}
 
@@ -382,11 +384,11 @@ rewrite:
 
 			if (!skip_map && stmt->named_rewrite_template) {
 				/* create a mapping */
-				zend_hash_str_update_mem(stmt->bound_param_map, name, plc->len, ZSTR_VAL(plc->quoted), ZSTR_LEN(plc->quoted) + 1);
+				zend_hash_update_ptr(stmt->bound_param_map, name_str, plc->quoted);
 			}
 
 			/* map number to name */
-			zend_hash_index_update_mem(stmt->bound_param_map, plc->bindno, ZSTR_VAL(plc->quoted), ZSTR_LEN(plc->quoted) + 1);
+			zend_hash_index_update_ptr(stmt->bound_param_map, plc->bindno, plc->quoted);
 
 			efree(name);
 		}
@@ -405,8 +407,11 @@ rewrite:
 
 		for (plc = placeholders; plc; plc = plc->next) {
 			char *name;
+			zend_string *name_str;
 			name = estrndup(plc->pos, plc->len);
-			zend_hash_index_update_mem(stmt->bound_param_map, plc->bindno, name, plc->len + 1);
+			name_str = zend_string_init(name, plc->len, 0);
+			//zend_hash_index_update_mem(stmt->bound_param_map, plc->bindno, name, plc->len + 1);
+			zend_hash_index_update_ptr(stmt->bound_param_map, plc->bindno, name_str);
 			efree(name);
 			plc->quoted = ZSTR_CHAR('?');
 			newbuffer_len -= plc->len - 1;

ext/pdo/pdo_stmt.c

@@ -50,7 +50,7 @@ static inline bool rewrite_name_to_position(pdo_stmt_t *stmt, struct pdo_bound_p
 		 * we will raise an error, as we can't be sure that it is safe
 		 * to bind multiple parameters onto the same zval in the underlying
 		 * driver */
-		char *name;
+		zend_string *name;
 		int position = 0;
 
 		if (stmt->named_rewrite_template) {
@@ -60,7 +60,7 @@ static inline bool rewrite_name_to_position(pdo_stmt_t *stmt, struct pdo_bound_p
 		if (!param->name) {
 			/* do the reverse; map the parameter number to the name */
 			if ((name = zend_hash_index_find_ptr(stmt->bound_param_map, param->paramno)) != NULL) {
-				param->name = zend_string_init(name, strlen(name), 0);
+				param->name = name;
 				return 1;
 			}
 			/* TODO Error? */
@@ -69,7 +69,7 @@ static inline bool rewrite_name_to_position(pdo_stmt_t *stmt, struct pdo_bound_p
 		}
 
 		ZEND_HASH_FOREACH_PTR(stmt->bound_param_map, name) {
-			if (strncmp(name, ZSTR_VAL(param->name), ZSTR_LEN(param->name) + 1)) {
+			if (zend_string_equals(name, param->name)) {
 				position++;
 				continue;
 			}

ext/pdo_pgsql/pgsql_statement.c

@@ -275,11 +275,11 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
 						ZEND_ATOL(param->paramno, ZSTR_VAL(param->name) + 1);
 					} else {
 						/* resolve parameter name to rewritten name */
-						char *namevar;
+						zend_string *namevar;
 
 						if (stmt->bound_param_map && (namevar = zend_hash_find_ptr(stmt->bound_param_map,
 								param->name)) != NULL) {
-							ZEND_ATOL(param->paramno, namevar + 1);
+							param->paramno = ZEND_STRTOL(ZSTR_VAL(namevar), NULL, 10);
 							param->paramno--;
 						} else {
 							pdo_pgsql_error_stmt_msg(stmt, 0, "HY093", ZSTR_VAL(param->name));