Fix a few things, restore checks for characters, add handlers

Author: ircmaxell

Zend/zend_autoload.c

@@ -42,6 +42,11 @@ void* zend_autoload_call(zend_string *name, zend_string *lname, long type)
     zval dummy, ztype, zname, retval;
     zend_autoload_func *func_info;
 
+    /* Verify autoload name before passing it to __autoload() */
+    if (strspn(name->val, "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\177\200\201\202\203\204\205\206\207\210\211\212\213\214\215\216\217\220\221\222\223\224\225\226\227\230\231\232\233\234\235\236\237\240\241\242\243\244\245\246\247\250\251\252\253\254\255\256\257\260\261\262\263\264\265\266\267\270\271\272\273\274\275\276\277\300\301\302\303\304\305\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\332\333\334\335\336\337\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377\\") != name->len) {
+        return NULL;
+    }
+
     ZVAL_UNDEF(&dummy);
     ZVAL_LONG(&ztype, type);
     ZVAL_STR(&zname, name);

Zend/zend_execute.h

@@ -42,6 +42,11 @@ ZEND_API void execute_ex(zend_execute_data *execute_data);
 ZEND_API void execute_internal(zend_execute_data *execute_data, zval *return_value);
 ZEND_API zend_class_entry *zend_lookup_class(zend_string *name);
 ZEND_API zend_class_entry *zend_lookup_class_ex(zend_string *name, const zval *key, int use_autoload);
+ZEND_API zend_function *zend_lookup_function(zend_string *name);
+ZEND_API zend_function *zend_lookup_function_ex(zend_string *name, const zval *key, int use_autoload);
+
+#define ZEND_LOOKUP_FUNCTION_BY_NAME(name, fbc) ((fbc = (zend_function*) zend_hash_find(EG(function_table), name)) != NULL || (fbc = zend_lookup_function(name)) != NULL)
+
 ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name);
 ZEND_API int zend_eval_stringl(char *str, size_t str_len, zval *retval_ptr, char *string_name);
 ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions);

Zend/zend_execute_API.c

@@ -973,6 +973,60 @@ ZEND_API zend_class_entry *zend_lookup_class(zend_string *name) /* {{{ */
 }
 /* }}} */
 
+ZEND_API zend_function *zend_lookup_function(zend_string *name) /* {{{ */
+{
+    return zend_lookup_function_ex(name, NULL, 1);
+}
+/* }}} */
+
+ZEND_API zend_function *zend_lookup_function_ex(zend_string *name, const zval *key, int use_autoload) /* {{{ */
+{
+    zend_function *fe = NULL;
+    zend_string *lc_name;
+
+    if (key) {
+        lc_name = Z_STR_P(key);
+    } else {
+        if (name == NULL || !name->len) {
+            return NULL;
+        }
+
+        if (name->val[0] == '\\') {
+            lc_name = zend_string_alloc(name->len - 1, 0);
+            zend_str_tolower_copy(lc_name->val, name->val + 1, name->len - 1);
+        } else {
+            lc_name = zend_string_alloc(name->len, 0);
+            zend_str_tolower_copy(lc_name->val, name->val, name->len);
+        }
+    }
+
+    fe = zend_hash_find_ptr(EG(function_table), lc_name);
+    if (fe) {
+        if (!key) {
+            zend_string_free(lc_name);
+        }
+        return fe;
+    }
+
+    /* The compiler is not-reentrant. Make sure we __autoload() only during run-time
+     * (doesn't impact functionality of __autoload()
+    */
+    if (!use_autoload || zend_is_compiling()) {
+        if (!key) {
+            zend_string_free(lc_name);
+        }
+        return NULL;
+    }
+
+    fe = (zend_function*) zend_autoload_call(name, lc_name, ZEND_AUTOLOAD_FUNCTION);
+
+    if (!key) {
+        zend_string_free(lc_name);
+    }
+    return fe;
+}
+/* }}} */
+
 ZEND_API int zend_eval_stringl(char *str, size_t str_len, zval *retval_ptr, char *string_name) /* {{{ */
 {
 	zval pv;