fix quoter

Girgias · Girgias · commit 89a7ceac8742 · 2020-12-23T18:13:38.000+01:00
diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
@@ -235,21 +235,18 @@ safe:
 					php_stream_from_zval_no_verify(stm, parameter);
 					if (stm) {
 						zend_string *buf;
+						zend_string *quoted;
 
 						buf = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0);
 						if (!buf) {
 							buf = ZSTR_EMPTY_ALLOC();
 						}
-						if (!stmt->dbh->methods->quoter(stmt->dbh, ZSTR_VAL(buf), ZSTR_LEN(buf), &plc->quoted, &plc->qlen,
-								param->param_type)) {
-							/* bork */
-							ret = -1;
-							strncpy(stmt->error_code, stmt->dbh->error_code, 6);
-							if (buf) {
-								zend_string_release_ex(buf, 0);
-							}
-							goto clean_up;
-						}
+
+						quoted = stmt->dbh->methods->quoter(stmt->dbh, buf, param->param_type);
+
+						plc->quoted = ZSTR_VAL(quoted);
+						plc->qlen = ZSTR_LEN(quoted);
+
 						if (buf) {
 							zend_string_release_ex(buf, 0);
 						}
@@ -289,12 +286,10 @@ safe:
 							plc->freeq = 0;
 							break;
 
-						default:
+						default: {
 							buf = zval_get_string(parameter);
-							if (EG(exception) ||
-								!stmt->dbh->methods->quoter(stmt->dbh, ZSTR_VAL(buf),
-									ZSTR_LEN(buf), &plc->quoted, &plc->qlen,
-									param_type)) {
+
+							if (EG(exception)) {
 								/* bork */
 								ret = -1;
 								strncpy(stmt->error_code, stmt->dbh->error_code, 6);
@@ -303,7 +298,12 @@ safe:
 								}
 								goto clean_up;
 							}
+
+							zend_string *quoted = stmt->dbh->methods->quoter(stmt->dbh, buf, param->param_type);
+							plc->quoted = ZSTR_VAL(quoted);
+							plc->qlen = ZSTR_LEN(quoted);
 							plc->freeq = 1;
+						}
 					}
 
 					if (buf) {
