Re: [ZEND-ENGINE-CVS] cvs: ZendEngine2 / zend_execute.c

Does this problem also happen with PHP 4? At 01:18 AM 12/12/2003 +0200, Jani Taskinen wrote:

    MFH?

    --Jani

On Thu, 11 Dec 2003, Andi Gutmans wrote:

andi           Thu Dec 11 05:21:16 2003 EDT

Modified files:

   /ZendEngine2       zend_execute.c

Log: - Refix bug #24773 Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.562 ZendEngine2/zend_execute.c:1.563 --- ZendEngine2/zend_execute.c:1.562 Thu Dec 11 04:52:33 2003 +++ ZendEngine2/zend_execute.c Thu Dec 11 05:21:16 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.562 2003/12/11 09:52:33 helly Exp $ */ +/* $Id: zend_execute.c,v 1.563 2003/12/11 10:21:16 andi Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -1950,11 +1950,13 @@

      }
      */
      zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
-      PZVAL_UNLOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr);
-      if (EX_T(EX(opline)->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
- SEPARATE_ZVAL_IF_NOT_REF(EX_T(EX(opline)->result.u.var).var.ptr_ptr);
+      if (EX_T(EX(opline)->result.u.var).var.ptr_ptr != NULL) {
+              PZVAL_UNLOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr);
+              if (EX_T(EX(opline)->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
+ SEPARATE_ZVAL_IF_NOT_REF(EX_T(EX(opline)->result.u.var).var.ptr_ptr);
+              }
+              PZVAL_LOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr);
      }
-      PZVAL_LOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr);
      NEXT_OPCODE();

} -- Zend Engine CVS Mailing List (http://cvs.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php