cvs: ZendEngine2(PHP_5_3) / zend_compile.c

tony2001		Thu Jan  8 22:36:03 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_compile.c 
  Log:
  MFH: use correct check for constants and stop segfaulting
  (5_2 doesn't need this)
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.97&r2=1.647.2.27.2.41.2.98&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.97 ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.98
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.97	Wed Dec 31 11:15:31 2008
+++ ZendEngine2/zend_compile.c	Thu Jan  8 22:36:03 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.97 2008/12/31 11:15:31 sebastian Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.98 2009/01/08 22:36:03 tony2001 Exp $ */
 
 #include <zend_language_parser.h>
 #include "zend.h"
@@ -4641,7 +4641,7 @@
 		zend_encoding *new_encoding, *old_encoding;
 		zend_encoding_filter old_input_filter;
 
-		if (Z_TYPE(val->u.constant) == IS_CONSTANT) {
+		if ((Z_TYPE(val->u.constant) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT) {
 			zend_error(E_COMPILE_ERROR, "Cannot use constants as encoding");
 		}