cvs: ZendEngine2 / zend_compile.c

helly           Tue May 31 05:06:44 2005 EDT

  Modified files:              
    /ZendEngine2        zend_compile.c 
  Log:
  - Only allow changing return ref agnostic when a script method overrides an
    internal method (found by dmitry)
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_compile.c?r1=1.625&r2=1.626&ty=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.625 ZendEngine2/zend_compile.c:1.626
--- ZendEngine2/zend_compile.c:1.625    Sat May 28 06:24:56 2005
+++ ZendEngine2/zend_compile.c  Tue May 31 05:06:43 2005
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_compile.c,v 1.625 2005/05/28 10:24:56 helly Exp $ */
+/* $Id: zend_compile.c,v 1.626 2005/05/31 09:06:43 helly Exp $ */
 
 #include <zend_language_parser.h>
 #include "zend.h"
@@ -1837,7 +1837,7 @@
        if (proto->common.return_reference != ZEND_RETURN_REFERENCE_AGNOSTIC
        && fe->common.return_reference != proto->common.return_reference) {
                /* atm we cannot let internal function return by ref */
-               if (fe->type != ZEND_INTERNAL_FUNCTION && proto->type == 
ZEND_INTERNAL_FUNCTION) {
+               if (fe->type == proto->type || fe->type != 
ZEND_INTERNAL_FUNCTION) {
                        return 0;
                }
        }

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