Merge pull request #1470 from avan989:Fix-1469-address-sanitizer-idma

Fix #1469, f-sanitizer issue in coverage-shared-idma
nasa · Jul 15, 2024 · f818422 · f818422
2 parents 5e41e8a + 5e2d100
commit f818422
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/os/shared/src/osapi-idmap.c b/src/os/shared/src/osapi-idmap.c
@@ -597,7 +597,6 @@ int32 OS_ObjectIdFindNextFree(OS_object_token_t *token)
 
     base_id       = OS_GetBaseForObjectType(token->obj_type);
     max_id        = OS_GetMaxForObjectType(token->obj_type);
-    objtype_state = &OS_objtype_state[token->obj_type];
 
     if (max_id == 0)
     {
@@ -610,8 +609,9 @@ int32 OS_ObjectIdFindNextFree(OS_object_token_t *token)
     }
     else
     {
-        return_code = OS_ERR_NO_FREE_IDS;
-        serial      = OS_ObjectIdToSerialNumber_Impl(objtype_state->last_id_issued);
+        return_code   = OS_ERR_NO_FREE_IDS;
+        objtype_state = &OS_objtype_state[token->obj_type];
+        serial        = OS_ObjectIdToSerialNumber_Impl(objtype_state->last_id_issued);
     }
 
     for (i = 0; i < max_id; ++i)