Fixed potential null pointer dereferences

diff --git a/src/lib/cursor.c b/src/lib/cursor.c
index 9b02b8c..580dbf1 100644 (file)
--- a/src/lib/cursor.c
+++ b/src/lib/cursor.c
@@ -31,12 +31,12 @@
  */
 VALUE_PAIR *_fr_cursor_init(vp_cursor_t *cursor, VALUE_PAIR const * const *node)
 {
-       memset(cursor, 0, sizeof(*cursor));
-
        if (!node || !cursor) {
                return NULL;
        }
 
+       memset(cursor, 0, sizeof(*cursor));
+
        /*
         *  Useful check to see if uninitialised memory is pointed
         *  to by node

diff --git a/src/modules/rlm_eap/eap.c b/src/modules/rlm_eap/eap.c
index c8c578d..1062aaa 100644 (file)
--- a/src/modules/rlm_eap/eap.c
+++ b/src/modules/rlm_eap/eap.c
@@ -180,12 +180,12 @@ static int eap_module_call(eap_module_t *module, eap_handler_t *handler)
 
        char const *caller = request->module;
 
+       rad_assert(module != NULL);
+
        RDEBUG2("Calling %s to process EAP data", module->type->name);
 
        request->module = module->type->name;
 
-       rad_assert(module != NULL);
-
        switch (handler->stage) {
        case INITIATE:
                if (!module->type->initiate(module->instance, handler)) {