Merge pull request eclipse-wakaama#338 from Saku2/master

Avoid accessing freed memory when deleting object
XiaoboYang · Nov 6, 2017 · f854a15 · f854a15
2 parents 238b451 + b532b0e
commit f854a15
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/objects.c b/core/objects.c
@@ -384,11 +384,11 @@ uint8_t object_delete(lwm2m_context_t * contextP,
         while (NULL != instanceP
             && result == COAP_202_DELETED)
         {
+            uriP->instanceId = instanceP->id;
             result = objectP->deleteFunc(instanceP->id, objectP);
             if (result == COAP_202_DELETED)
             {
                 uriP->flag |= LWM2M_URI_FLAG_INSTANCE_ID;
-                uriP->instanceId = instanceP->id;
                 observe_clear(contextP, uriP);
                 uriP->flag &= ~LWM2M_URI_FLAG_INSTANCE_ID;
             }