From: Christopher Jones <christopher.jones@oracle.com>
Date: Thu, 4 Aug 2016 07:01:57 +0000 (+1000)
Subject: Fixed invalid handle error with Implicit Result Sets
X-Git-Tag: php-7.1.0beta3~111^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b7a699acd3c064a39c1df8c7f7a0a5b66e07f0c;p=php

Fixed invalid handle error with Implicit Result Sets
---

2b7a699acd3c064a39c1df8c7f7a0a5b66e07f0c
diff --cc ext/oci8/oci8.c
index 86f22a208f,020312b642..5df00d655d
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@@ -2713,9 -2692,10 +2713,10 @@@ void php_oci_fetch_row (INTERNAL_FUNCTI
  #else /* OCI_MAJOR_VERSION */
  	PHP_OCI_ZVAL_TO_STATEMENT(z_statement, invokedstatement);
  
- 	if (invokedstatement->impres_flag == PHP_OCI_IMPRES_NO_CHILDREN) {
+ 	if (invokedstatement->impres_flag == PHP_OCI_IMPRES_NO_CHILDREN ||
+         invokedstatement->impres_flag == PHP_OCI_IMPRES_IS_CHILD) {
  		/* Already know there are no Implicit Result Sets */
 -	    statement = invokedstatement; 
 +	    statement = invokedstatement;
  	} else if (invokedstatement->impres_flag == PHP_OCI_IMPRES_HAS_CHILDREN) {
  		/* Previously saw an Implicit Result Set in an earlier invocation of php_oci_fetch_row */
  		statement = (php_oci_statement *)invokedstatement->impres_child_stmt;
diff --cc ext/oci8/package.xml
index 88462415cb,07b982f435..25be979e9b
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@@ -46,12 -46,12 +46,12 @@@ Interoperability Support" (ID 207303.1
    <active>no</active>
   </lead>
  
-  <date>2016-04-15</date>
 - <date>2016-07-04</date>
++ <date>2016-08-04</date>
   <time>12:00:00</time>
  
    <version>
-    <release>2.1.1</release>
-    <api>2.1.1</api>
 -   <release>2.0.12</release>
 -   <api>2.0.12</api>
++   <release>2.1.2</release>
++   <api>2.1.2</api>
    </version>
    <stability>
     <release>stable</release>
@@@ -59,8 -59,7 +59,8 @@@
    </stability>
    <license uri="http://www.php.net/license">PHP</license>
    <notes>
 +This version is for PHP 7 only.
- Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns)
+ Fixed invalid handle error with Implicit Result Sets
    </notes>
   <contents>
    <dir name="/">
@@@ -467,19 -465,18 +467,35 @@@
   </extsrcrelease>
   <changelog>
  
+ <release>
+   <version>
 -   <release>2.0.11</release>
 -   <api>2.0.11</api>
++   <release>2.1.1</release>
++   <api>2.1.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://www.php.net/license">PHP</license>
+   <notes>
 -Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column)
++This version is for PHP 7 only.
++Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns)
++  </notes>
++</release>
++
 +<release>
 +  <version>
 +   <release>2.1.0</release>
 +   <api>2.1.0</api>
 +  </version>
 +  <stability>
 +   <release>stable</release>
 +   <api>stable</api>
 +  </stability>
 +  <license uri="http://www.php.net/license">PHP</license>
 +  <notes>
 +This version is for PHP 7 only.
 +Updated driver name format.    
    </notes>
  </release>