From: Felipe Pena <felipe@php.net>
Date: Wed, 25 Aug 2010 22:03:03 +0000 (+0000)
Subject: - Fixed bug #52699 (PDO bindValue writes long int 32bit enum)
X-Git-Tag: php-5.3.4RC1~311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fba11c57b3045db96b366c1f8426184d78d1f8f;p=php

- Fixed bug #52699 (PDO bindValue writes long int 32bit enum)
---

diff --git a/NEWS b/NEWS
index 021de80cbd..a902870cd8 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@
 - Changed the $context parameter on copy() to actually have an effect. (Kalle)
 - Fixed possible crash in mssql_fetch_batch(). (Kalle)
 
+- Fixed bug #52699 (PDO bindValue writes long int 32bit enum).
+  (rein at basefarm dot no)
 - Fixed bug #52681 (mb_send_mail() appends an extra MIME-Version header).
   (Adam)
 - Fixed bug #52674 (FPM Status page returns inconsistent Content-Type headers).
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 2403dfb911..5c3fedfe10 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -1624,18 +1624,20 @@ static int register_bound_param(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt,
 static PHP_METHOD(PDOStatement, bindValue)
 {
 	struct pdo_bound_param_data param = {0};
+	long param_type = PDO_PARAM_STR;
 	PHP_STMT_GET_OBJ;
 
 	param.paramno = -1;
-	param.param_type = PDO_PARAM_STR;
 	
 	if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-			"lz/|l", &param.paramno, &param.parameter, &param.param_type)) {
+			"lz/|l", &param.paramno, &param.parameter, &param_type)) {
 		if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz/|l", &param.name,
-				&param.namelen, &param.parameter, &param.param_type)) {
+				&param.namelen, &param.parameter, &param_type)) {
 			RETURN_FALSE;
 		}
 	}
+
+	param.param_type = (int) param_type;
 	
 	if (param.paramno > 0) {
 		--param.paramno; /* make it zero-based internally */