- Add check for avoid segfault when trying instantiate PDORow manually

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 0730b403896b5eda4b131ff2abb914ba294c656e..e6244522a1780309b8f8261b629883ce5e757b95 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -2714,10 +2714,12 @@ zend_object_handlers pdo_row_object_handlers = {
 
 void pdo_row_free_storage(pdo_stmt_t *stmt TSRMLS_DC)
 {
-       ZVAL_NULL(&stmt->lazy_object_ref);
-       
-       if (--stmt->refcount == 0) {
-               free_statement(stmt TSRMLS_CC);
+       if (stmt) {
+               ZVAL_NULL(&stmt->lazy_object_ref);
+               
+               if (--stmt->refcount == 0) {
+                       free_statement(stmt TSRMLS_CC);
+               }
        }
 }
 

diff --git a/ext/pdo/tests/pdorow.phpt b/ext/pdo/tests/pdorow.phpt
new file mode 100644 (file)
index 0000000..b33dd15
--- /dev/null
+++ b/ext/pdo/tests/pdorow.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Trying instantiate a PDORow object manually
+--FILE--
+<?php
+
+new PDORow;
+
+?>
+--EXPECTF--
+Fatal error: PDORow::__construct(): You should not create a PDOStatement manually in %s on line %d