fix for PECL #3545

1 files changed, 29 insertions, 9 deletions

diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index 97e7616f5d..9666a62418 100644
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -189,18 +189,38 @@ PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
 						ret = -1;
 						goto clean_up;
 					}
+					plc->freeq = 1;
 				} else {
-					convert_to_string(param->parameter);
-					if (!stmt->dbh->methods->quoter(stmt->dbh, Z_STRVAL_P(param->parameter),
-								Z_STRLEN_P(param->parameter), &plc->quoted, &plc->qlen,
-								param->param_type TSRMLS_CC)) {
-						/* bork */
-						ret = -1;
-						strcpy(stmt->error_code, stmt->dbh->error_code);
-						goto clean_up;
+					switch (Z_TYPE_P(param->parameter)) {
+						case IS_NULL:
+							plc->quoted = "NULL";
+							plc->qlen = sizeof("NULL")-1;
+							plc->freeq = 0;
+							break;
+
+						case IS_BOOL:
+							convert_to_long(param->parameter);
+						case IS_LONG:
+						case IS_DOUBLE:
+							convert_to_string(param->parameter);
+							plc->qlen = Z_STRLEN_P(param->parameter);
+							plc->quoted = Z_STRLEN_P(param->parameter);
+							plc->freeq = 0;
+							break;
+
+						default:
+							convert_to_string(param->parameter);
+							if (!stmt->dbh->methods->quoter(stmt->dbh, Z_STRVAL_P(param->parameter),
+									Z_STRLEN_P(param->parameter), &plc->quoted, &plc->qlen,
+									param->param_type TSRMLS_CC)) {
+								/* bork */
+								ret = -1;
+								strcpy(stmt->error_code, stmt->dbh->error_code);
+								goto clean_up;
+							}
+							plc->freeq = 1;
 					}
 				}
-				plc->freeq = 1;
 			} else {
 				plc->quoted = Z_STRVAL_P(param->parameter);
 				plc->qlen = Z_STRLEN_P(param->parameter);