From 608dbcadb6af877d71e69c0e2dd5ab536c03d519 Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Wed, 24 Jul 2013 10:20:37 +0300 Subject: [PATCH] resource-native: do not use memory before assert. --- src/plugins/resource-native/plugin-resource-native.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/resource-native/plugin-resource-native.c b/src/plugins/resource-native/plugin-resource-native.c index 19126ef..1a180a2 100644 --- a/src/plugins/resource-native/plugin-resource-native.c +++ b/src/plugins/resource-native/plugin-resource-native.c @@ -906,8 +906,8 @@ static void resource_event_handler(uint32_t reqid, mrp_resource_set_t *rset, mrp_msg_append(m, MRP_MSG_TAG_##typ(RESPROTO_##tag, val)) client_t *client = (client_t *)userdata; - resource_data_t *data = client->data; - mrp_plugin_t *plugin = data->plugin; + resource_data_t *data; + mrp_plugin_t *plugin; uint16_t reqtyp; uint16_t state; mrp_resource_mask_t grant; @@ -923,6 +923,9 @@ static void resource_event_handler(uint32_t reqid, mrp_resource_set_t *rset, MRP_ASSERT(rset && client, "invalid argument"); + data = client->data; + plugin = data->plugin; + reqtyp = RESPROTO_RESOURCES_EVENT; id = mrp_get_resource_set_id(rset); grant = mrp_get_resource_set_grant(rset); -- 2.7.4