fix leaks

[m6w6/ext-psi] / src / module.c

diff --git a/src/module.c b/src/module.c
index c31ce8d4d948c6f1edd5c00751bebcc7cb6ac2fe..98b1a8d9d97a720f9ab69fe758e47f0ee8df3350 100644 (file)
--- a/src/module.c
+++ b/src/module.c
@@ -51,9 +51,69 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(psi);
 
+//#define ZEND_INI_MH(name) int name(zend_ini_entry *entry, zend_string *new_value, void *mh_arg1, void *mh_arg2, void *mh_arg3, int stage)
+
+static void OnUpdateBlacklist(const char *str, void (*cb)(const char*, size_t))
+{
+       const char *end;
+
+       do {
+               size_t len;
+
+               end = strchr(str, ',');
+               if (end) {
+                       len = end - str;
+               } else {
+                       len = strlen(str);
+               }
+               if (len) {
+                       cb(str, len);
+               }
+
+               str = end + 1;
+       } while (end);
+}
+
+static void psi_blacklist_add_decl(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedDecls)
+{
+       OnUpdateBlacklist(new_value->val, psi_blacklist_add_decl);
+       return SUCCESS;
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len);
+static ZEND_INI_MH(OnUpdateBlacklistedVars)
+{
+       OnUpdateBlacklist(new_value->val, psi_blacklist_add_var);
+       return SUCCESS;
+}
+
+static void OnDisplayBlacklist(struct psi_plist *bl)
+{
+       size_t i = 0;
+       char *item;
+
+       while (psi_plist_get(bl, i++, &item)) {
+               if (i > 1) {
+                       PUTS(",");
+               }
+               PUTS(item);
+       }
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedDecls)
+{
+       OnDisplayBlacklist(PSI_G(blacklist).decls);
+}
+static ZEND_INI_DISP(OnDisplayBlacklistedVars)
+{
+       OnDisplayBlacklist(PSI_G(blacklist).vars);
+}
+
 PHP_INI_BEGIN()
        STD_PHP_INI_ENTRY("psi.engine", PSI_ENGINE, PHP_INI_SYSTEM, OnUpdateString, engine, zend_psi_globals, psi_globals)
        STD_PHP_INI_ENTRY("psi.directory", "psi.d", PHP_INI_SYSTEM, OnUpdateString, directory, zend_psi_globals, psi_globals)
+       PHP_INI_ENTRY_EX("psi.blacklist.decls", "", PHP_INI_SYSTEM, OnUpdateBlacklistedDecls, OnDisplayBlacklistedDecls)
+       PHP_INI_ENTRY_EX("psi.blacklist.vars", "", PHP_INI_SYSTEM, OnUpdateBlacklistedVars, OnDisplayBlacklistedVars)
 PHP_INI_END();
 
 static zend_object_handlers psi_object_handlers;
@@ -133,6 +193,7 @@ static PHP_FUNCTION(psi_validate)
        struct psi_parser_input *I;
        struct psi_parser P;
        struct psi_data D = {0};
+       struct psi_validate_scope S = {0};
        zend_long flags = 0;
 
 #if PHP_DEBUG
@@ -155,7 +216,10 @@ static PHP_FUNCTION(psi_validate)
 
        psi_parser_parse(&P, I);
        psi_data_ctor(&D, P.error, P.flags);
-       RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
+       psi_validate_scope_ctor(&S);
+       S.defs = &P.preproc->defs;
+       RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)) && !P.errors);
+       psi_validate_scope_dtor(&S);
        psi_data_dtor(&D);
        psi_parser_dtor(&P);
        free(I);
@@ -170,6 +234,7 @@ static PHP_FUNCTION(psi_validate_string)
        struct psi_parser_input *I;
        struct psi_parser P;
        struct psi_data D = {0};
+       struct psi_validate_scope S = {0};
        zend_long flags = 0;
 
 #if PHP_DEBUG
@@ -192,7 +257,10 @@ static PHP_FUNCTION(psi_validate_string)
 
        psi_parser_parse(&P, I);
        psi_data_ctor(&D, P.error, P.flags);
-       RETVAL_BOOL(psi_data_validate(&D, PSI_DATA(&P)) && !P.errors);
+       psi_validate_scope_ctor(&S);
+       S.defs = &P.preproc->defs;
+       RETVAL_BOOL(psi_validate(&S, &D, PSI_DATA(&P)) && !P.errors);
+       psi_validate_scope_dtor(&S);
        psi_data_dtor(&D);
        psi_parser_dtor(&P);
        free(I);
@@ -322,16 +390,36 @@ static void ptr_free(void *ptr)
        free(*(void **) ptr);
 }
 
+static void psi_blacklist_add_decl(const char *pattern, size_t len)
+{
+       char *tmp = strndup(pattern, len);
+       struct psi_plist **decls = &PSI_G(blacklist).decls;
+
+       *decls = psi_plist_add(*decls, &tmp);
+}
+
+static void psi_blacklist_add_var(const char *pattern, size_t len)
+{
+       char *tmp = strndup(pattern, len);
+       struct psi_plist **vars = &PSI_G(blacklist).vars;
+
+       *vars = psi_plist_add(*vars, &tmp);
+}
+
 static PHP_GINIT_FUNCTION(psi)
 {
        char *tmp;
        struct psi_plist **bl_decls = &psi_globals->blacklist.decls;
+       struct psi_plist **bl_vars = &psi_globals->blacklist.vars;
 
        *bl_decls = psi_plist_init(ptr_free);
+       *bl_vars = psi_plist_init(ptr_free);
 
-#define BL_DECL_ADD(d) \
+#define BL_ADD(D, d) \
        tmp = strdup(d); \
-       *bl_decls = psi_plist_add(*bl_decls, &tmp)
+       *D = psi_plist_add(*D, &tmp)
+#define BL_DECL_ADD(d) BL_ADD(bl_decls, d)
+#define BL_VAR_ADD(d) BL_ADD(bl_vars, d)
 
        BL_DECL_ADD("dlsym");
        BL_DECL_ADD("alloca");
@@ -352,6 +440,9 @@ static PHP_GINIT_FUNCTION(psi)
        BL_DECL_ADD("*glob*64");
        /* Hurd only */
        BL_DECL_ADD("getumask");
+
+       /* using hidden structs */
+       BL_VAR_ADD("_IO_2_*");
 }
 
 static PHP_GSHUTDOWN_FUNCTION(psi)