Merge branch 'master' into phpng

* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c

1 files changed, 31 insertions, 9 deletions

diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index c31ef3e1c1..1d3c612f6a 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -54,7 +54,7 @@ static void php_sqlite3_error(php_sqlite3_db_object *db_obj, char *format, ...)
 	vspprintf(&message, 0, format, arg);
 	va_end(arg);
 
-	if (db_obj->exception) {
+	if (db_obj && db_obj->exception) {
 		zend_throw_exception(zend_exception_get_default(TSRMLS_C), message, 0 TSRMLS_CC);
 	} else {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", message);
@@ -67,11 +67,17 @@ static void php_sqlite3_error(php_sqlite3_db_object *db_obj, char *format, ...)
 /* }}} */
 
 #define SQLITE3_CHECK_INITIALIZED(db_obj, member, class_name) \
-	if (!(member)) { \
+	if (!(db_obj) || !(member)) { \
 		php_sqlite3_error(db_obj, "The " #class_name " object has not been correctly initialised"); \
 		RETURN_FALSE; \
 	}
 
+#define SQLITE3_CHECK_INITIALIZED_STMT(member, class_name) \
+	if (!(member)) { \
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "The " #class_name " object has not been correctly initialised"); \
+		RETURN_FALSE; \
+	}
+
 /* {{{ PHP_INI
 */
 PHP_INI_BEGIN()
@@ -191,12 +197,14 @@ PHP_METHOD(sqlite3, close)
 	}
 
 	if (db_obj->initialised) {
-		zend_llist_clean(&(db_obj->free_list));
-		errcode = sqlite3_close(db_obj->db);
-		if (errcode != SQLITE_OK) {
-			php_sqlite3_error(db_obj, "Unable to close database: %d, %s", errcode, sqlite3_errmsg(db_obj->db));
-			RETURN_FALSE;
-		}
+        zend_llist_clean(&(db_obj->free_list));
+		if(db_obj->db) {
+            errcode = sqlite3_close(db_obj->db);
+            if (errcode != SQLITE_OK) {
+			    php_sqlite3_error(db_obj, "Unable to close database: %d, %s", errcode, sqlite3_errmsg(db_obj->db));
+                RETURN_FALSE;
+		    }
+        }
 		db_obj->initialised = 0;
 	}
 
@@ -1242,6 +1250,8 @@ PHP_METHOD(sqlite3stmt, paramCount)
 		return;
 	}
 
+	SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
+
 	RETURN_LONG(sqlite3_bind_parameter_count(stmt_obj->stmt));
 }
 /* }}} */
@@ -1258,7 +1268,9 @@ PHP_METHOD(sqlite3stmt, close)
 		return;
 	}
 
-	zend_llist_del_element(&(stmt_obj->db_obj->free_list), object, (int (*)(void *, void *)) php_sqlite3_compare_stmt_zval_free);
+	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);
+	}
 
 	RETURN_TRUE;
 }
@@ -1276,6 +1288,8 @@ PHP_METHOD(sqlite3stmt, reset)
 		return;
 	}
 
+	SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
+
 	if (sqlite3_reset(stmt_obj->stmt) != SQLITE_OK) {
 		php_sqlite3_error(stmt_obj->db_obj, "Unable to reset statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
 		RETURN_FALSE;
@@ -1296,6 +1310,8 @@ PHP_METHOD(sqlite3stmt, clear)
 		return;
 	}
 
+	SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
+
 	if (sqlite3_clear_bindings(stmt_obj->stmt) != SQLITE_OK) {
 		php_sqlite3_error(stmt_obj->db_obj, "Unable to clear statement: %s", sqlite3_errmsg(sqlite3_db_handle(stmt_obj->stmt)));
 		RETURN_FALSE;
@@ -1317,6 +1333,8 @@ PHP_METHOD(sqlite3stmt, readOnly)
 		return;
 	}
 
+	SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
+
 #if SQLITE_VERSION_NUMBER >= 3007004
 	if (sqlite3_stmt_readonly(stmt_obj->stmt)) {
 		RETURN_TRUE;
@@ -1390,6 +1408,8 @@ PHP_METHOD(sqlite3stmt, bindParam)
 		}
 	}
 
+	SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
+
 	ZVAL_COPY(&param.parameter, parameter);
 
 	if (!register_bound_parameter_to_sqlite(&param, stmt_obj TSRMLS_CC)) {
@@ -1422,6 +1442,8 @@ PHP_METHOD(sqlite3stmt, bindValue)
 		}
 	}
 
+	SQLITE3_CHECK_INITIALIZED_STMT(stmt_obj->stmt, SQLite3Stmt);
+
 	ZVAL_COPY(&param.parameter, parameter);
 
 	if (!register_bound_parameter_to_sqlite(&param, stmt_obj TSRMLS_CC)) {