Merge branch 'PHP-5.6' into PHP-7.0

2 files changed, 49 insertions, 1 deletions

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 8d1d909acc..d135467192 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2564,7 +2564,14 @@ static int row_prop_exists(zval *object, zval *member, int check_empty, void **c
 		for (colno = 0; colno < stmt->column_count; colno++) {
 			if (ZSTR_LEN(stmt->columns[colno].name) == Z_STRLEN_P(member) &&
 			    strncmp(ZSTR_VAL(stmt->columns[colno].name), Z_STRVAL_P(member), Z_STRLEN_P(member)) == 0) {
-				return 1;
+					int res;
+					zval val;
+
+					fetch_value(stmt, &val, colno, NULL TSRMLS_CC);
+					res = check_empty ? i_zend_is_true(&val) : Z_TYPE(val) != IS_NULL;
+					zval_dtor(&val);
+
+					return res;
 			}
 		}
 	}
diff --git a/ext/pdo/tests/bug_60665.phpt b/ext/pdo/tests/bug_60665.phpt
new file mode 100644
index 0000000000..28c1482154
--- /dev/null
+++ b/ext/pdo/tests/bug_60665.phpt
@@ -0,0 +1,41 @@
+--TEST--
+PDO Common: Bug #60665 (call to empty() on NULL result using PDO::FETCH_LAZY returns false)
+--SKIPIF--
+<?php
+if (!extension_loaded('pdo')) die('skip');
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+$db = PDOTest::factory();
+
+$statement = $db->prepare("SELECT NULL AS null_value, 0 AS zero, 1 AS one");
+$statement->execute();
+$row = $statement->fetch(PDO::FETCH_LAZY);
+var_dump(
+    empty($row->null_value),
+    empty($row->zero),
+    !empty($row->one),
+    empty($row->missing),
+    !isset($row->null_value),
+    isset($row->zero),
+    isset($row->one),
+    !isset($row->missing)
+);
+?>
+===DONE===
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+===DONE===