Require that the modules call talloc for their instance handle.

[freeradius.git] / src / modules / rlm_rest / rlm_rest.c

diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index ca611f3..4866895 100644 (file)
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -232,18 +232,14 @@ static int rlm_rest_instantiate(CONF_SECTION *conf, void **instance)
        /*
         *      Allocate memory for instance data.
         */
-       data = rad_malloc(sizeof(*data));
-       if (!data) {
-               return -1;
-       }
-       memset(data, 0, sizeof(*data));
+       *instance = data = talloc_zero(conf, rlm_rest_t);
+       if (!data) return -1;
 
        /*
         *      If the configuration parameters can't be parsed, then
         *      fail.
         */
        if (cf_section_parse(conf, data, module_config) < 0) {
-               free(data);
                return -1;
        }
 
@@ -288,8 +284,6 @@ static int rlm_rest_instantiate(CONF_SECTION *conf, void **instance)
                return -1;
        }
 
-       *instance = data;
-
        return 0;
 }
 
@@ -421,8 +415,6 @@ static int rlm_rest_detach(void *instance)
 
        fr_connection_pool_delete(my_instance->conn_pool);
 
-       free(my_instance);
-
        /* Free any memory used by libcurl */
        rest_cleanup();