[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c trunk/ext/pdo_mysql/mysql_statement.c

[Kalle Sommer Nielsen]

kalleTue, 05 Oct 2010 09:58:15 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=304072

Log:
Fixed constness compiler warning in pdo_mysql

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
U   php/php-src/trunk/ext/pdo_mysql/mysql_statement.c

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
2010-10-05 09:48:07 UTC (rev 304071)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
2010-10-05 09:58:15 UTC (rev 304072)
@@ -886,7 +886,7 @@
 #endif

add_assoc_zval(return_value, flags, flags);
-   add_assoc_string(return_value, table,(F-table?F-table:), 1);
+   add_assoc_string(return_value, table,(char *) (F-table?F-table:), 
1);
PDO_DBG_RETURN(SUCCESS);
 } /* }}} */


Modified: php/php-src/trunk/ext/pdo_mysql/mysql_statement.c
===
--- php/php-src/trunk/ext/pdo_mysql/mysql_statement.c   2010-10-05 09:48:07 UTC 
(rev 304071)
+++ php/php-src/trunk/ext/pdo_mysql/mysql_statement.c   2010-10-05 09:58:15 UTC 
(rev 304072)
@@ -867,7 +867,7 @@
 #endif

add_assoc_zval(return_value, flags, flags);
-   add_assoc_string(return_value, table,(F-table?F-table:), 1);
+   add_assoc_string(return_value, table, (char *) 
(F-table?F-table:), 1);
PDO_DBG_RETURN(SUCCESS);
 } /* }}} */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c trunk/ext/pdo_mysql/mysql_statement.c

[Andrey Hristov]

andrey   Fri, 21 May 2010 11:09:28 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=299574

Log:
Fix for Bug #51870
PDO::fetchAll after a PDO::execute with bindings lead to a segv.

It is only in unreleased code and thus doesn't deserve a NEWS entry

Bug: http://bugs.php.net/51870 (Open) PDO::fetchAll after a PDO::execute with 
bindings lead to a segv.
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
U   php/php-src/trunk/ext/pdo_mysql/mysql_statement.c

Modified: php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
2010-05-21 11:09:17 UTC (rev 299573)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/mysql_statement.c
2010-05-21 11:09:28 UTC (rev 299574)
@@ -111,7 +111,7 @@
 #endif /* HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND */
 #if PDO_USE_MYSQLND
if (!S-stmt  S-current_data) {
-   free(S-current_data);
+   mnd_free(S-current_data);
}
 #endif /* PDO_USE_MYSQLND */

@@ -652,7 +652,7 @@
}
 #if PDO_USE_MYSQLND
if (!S-stmt  S-current_data) {
-   free(S-current_data);
+   mnd_free(S-current_data);
}
 #endif /* PDO_USE_MYSQLND */


Modified: php/php-src/trunk/ext/pdo_mysql/mysql_statement.c
===
--- php/php-src/trunk/ext/pdo_mysql/mysql_statement.c   2010-05-21 11:09:17 UTC 
(rev 299573)
+++ php/php-src/trunk/ext/pdo_mysql/mysql_statement.c   2010-05-21 11:09:28 UTC 
(rev 299574)
@@ -111,7 +111,7 @@
 #endif /* HAVE_MYSQL_NEXT_RESULT || PDO_USE_MYSQLND */
 #if PDO_USE_MYSQLND
if (!S-stmt  S-current_data) {
-   free(S-current_data);
+   mnd_free(S-current_data);
}
 #endif /* PDO_USE_MYSQLND */

@@ -652,7 +652,7 @@
}
 #if PDO_USE_MYSQLND
if (!S-stmt  S-current_data) {
-   free(S-current_data);
+   mnd_free(S-current_data);
}
 #endif /* PDO_USE_MYSQLND */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php