From: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Tue, 22 Nov 2011 20:58:47 +0000 (+0100)
Subject: don't try to access non public property or method
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d807981bc65af1b910e2622ff00ecd9b590f7452;p=web%2Fkonrad%2Ftwig.git

don't try to access non public property or method
---

diff --git a/ext/twig/twig.c b/ext/twig/twig.c
index ef7ae5f..b088fdf 100644
--- a/ext/twig/twig.c
+++ b/ext/twig/twig.c
@@ -621,22 +621,32 @@ char *TWIG_GET_CLASS_NAME(zval *object TSRMLS_DC)
 
 static void twig_add_method_to_class(zend_function *mptr TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
-	zval *retval = va_arg(args, zval*);
-	char *item = php_strtolower(mptr->common.function_name, strlen(mptr->common.function_name));
+	zval *retval;
+	char *item;
+
+	if ( ! (mptr->common.fn_flags & ZEND_ACC_PUBLIC ) ) {
+		return;
+	}
+
+	retval = va_arg(args, zval*);
+	item = php_strtolower(mptr->common.function_name, strlen(mptr->common.function_name));
 
 	add_assoc_string(retval, item, item, 1);
 }
 
 static int twig_add_property_to_class(zend_property_info *pptr TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
-	zend_class_entry *ce = *va_arg(args, zend_class_entry**);
-	zval *retval = va_arg(args, zval*);
+	zend_class_entry *ce;
+	zval *retval;
 	char *class_name, *prop_name;
 
-	if (pptr->flags & ZEND_ACC_SHADOW) {
+	if ( ! (pptr->flags & ZEND_ACC_PUBLIC ) ) {
 		return 0;
 	}
 
+	ce = *va_arg(args, zend_class_entry**);
+	retval = va_arg(args, zval*);
+
 	zend_unmangle_property_name(pptr->name, pptr->name_length, &class_name, &prop_name);
 
 	add_assoc_string(retval, prop_name, prop_name, 1);