com php-src: Merge branch 'PHP-5.6': ext/sqlite3/sqlite3.c
| From: | Stanislav Malyshev | Date: | Mon, 06 Apr 2015 05:45:16 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/sqlite3/sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86092@lists.php.net to get a copy of this message | ||
Commit: ff740f16f9e544fe20265070ae82686b8ca3da66
Author: Stanislav Malyshev <stas@php.net> Sun, 5 Apr 2015 22:45:16 -0700
Parents: 8976e8d9f05dbfae389934598e4ed473a48a9458 2a81733c87d9d62becc46add120c41c4818396ca
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ff740f16f9e544fe20265070ae82686b8ca3da66
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #66550 (SQLite prepared statement use-after-free)
Conflicts:
ext/sqlite3/sqlite3.c
Bugs:
https://bugs.php.net/66550
Changed paths:
MM ext/sqlite3/sqlite3.c
Diff:
diff --cc ext/sqlite3/sqlite3.c
index f1e7592,58ab5e8..028881f
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@@ -1252,6 -1294,6 +1252,7 @@@ PHP_METHOD(sqlite3stmt, paramCount
return;
}
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
RETURN_LONG(sqlite3_bind_parameter_count(stmt_obj->stmt));
@@@ -1270,6 -1314,6 +1271,8 @@@ PHP_METHOD(sqlite3stmt, close
return;
}
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
++
if(stmt_obj->db_obj) {
zend_llist_del_element(&(stmt_obj->db_obj->free_list), object, (int (*)(void *,
void *)) php_sqlite3_compare_stmt_zval_free);
}
@@@ -1290,6 -1336,6 +1293,7 @@@ PHP_METHOD(sqlite3stmt, reset
return;
}
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
if (sqlite3_reset(stmt_obj->stmt) != SQLITE_OK) {
@@@ -1312,6 -1360,6 +1316,7 @@@ PHP_METHOD(sqlite3stmt, clear
return;
}
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
if (sqlite3_clear_bindings(stmt_obj->stmt) != SQLITE_OK) {
@@@ -1335,6 -1385,6 +1340,7 @@@ PHP_METHOD(sqlite3stmt, readOnly
return;
}
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
#if SQLITE_VERSION_NUMBER >= 3007004
@@@ -1410,14 -1461,14 +1416,15 @@@ PHP_METHOD(sqlite3stmt, bindParam
}
}
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
- Z_ADDREF_P(param.parameter);
+ ZVAL_COPY(¶m.parameter, parameter);
- if (!register_bound_parameter_to_sqlite(¶m, stmt_obj TSRMLS_CC)) {
- if (param.parameter) {
+ if (!register_bound_parameter_to_sqlite(¶m, stmt_obj)) {
+ if (!Z_ISUNDEF(param.parameter)) {
zval_ptr_dtor(&(param.parameter));
- param.parameter = NULL;
+ ZVAL_UNDEF(¶m.parameter);
}
RETURN_FALSE;
}
@@@ -1444,14 -1496,14 +1451,15 @@@ PHP_METHOD(sqlite3stmt, bindValue
}
}
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
- Z_ADDREF_P(param.parameter);
+ ZVAL_COPY(¶m.parameter, parameter);
- if (!register_bound_parameter_to_sqlite(¶m, stmt_obj TSRMLS_CC)) {
- if (param.parameter) {
+ if (!register_bound_parameter_to_sqlite(¶m, stmt_obj)) {
+ if (!Z_ISUNDEF(param.parameter)) {
zval_ptr_dtor(&(param.parameter));
- param.parameter = NULL;
+ ZVAL_UNDEF(¶m.parameter);
}
RETURN_FALSE;
}
@@@ -1475,21 -1529,15 +1483,21 @@@ PHP_METHOD(sqlite3stmt, execute
return;
}
-- SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3)
++ SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
if (stmt_obj->bound_params) {
- zend_hash_internal_pointer_reset(stmt_obj->bound_params);
- while (zend_hash_get_current_data(stmt_obj->bound_params, (void **)¶m) == SUCCESS) {
+ ZEND_HASH_FOREACH_PTR(stmt_obj->bound_params, param) {
+ zval *parameter;
+ /* parameter must be a reference? */
+ if (Z_ISREF(param->parameter)) {
+ parameter = Z_REFVAL(param->parameter);
+ } else {
+ parameter = ¶m->parameter;
+ }
+
/* If the ZVAL is null then it should be bound as that */
- if (Z_TYPE_P(param->parameter) == IS_NULL) {
+ if (Z_TYPE_P(parameter) == IS_NULL) {
sqlite3_bind_null(stmt_obj->stmt, param->param_number);
- zend_hash_move_forward(stmt_obj->bound_params);
continue;
}