Merge pull request #1471 from nasa/integration-candidate

osal Integration candidate: Equuleus-rc1+dev14
nasa · Jul 15, 2024 · d6412df · d6412df
2 parents 269a522 + 765c8d9
commit d6412df
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1:dev81
+- Fix Address Sanitizer issue in vxworks-console-testrunner
+- f-sanitizer issue in coverage-shared-idma
+- See <https://github.com/nasa/osal/pull/1467> and <https://github.com/nasa/osal/pull/1470>
+
 ## Development Build: equuleus-rc1+dev73
 - High-res timed stream ops
 - Moves OS_strnlen to public API and adds static analysis comments

diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -34,7 +34,7 @@
 /*
  * Development Build Macro Definitions
  */
-#define OS_BUILD_NUMBER     73
+#define OS_BUILD_NUMBER     81
 #define OS_BUILD_BASELINE   "equuleus-rc1"
 #define OS_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define OS_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */

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)

diff --git a/src/os/vxworks/src/os-impl-console.c b/src/os/vxworks/src/os-impl-console.c
@@ -121,13 +121,13 @@ int32 OS_ConsoleCreate_Impl(const OS_object_token_t *token)
     int32                              return_code;
     OS_console_internal_record_t *     console;
 
-    local   = OS_OBJECT_TABLE_GET(OS_impl_console_table, *token);
-    console = OS_OBJECT_TABLE_GET(OS_console_table, *token);
-
     if (OS_ObjectIndexFromToken(token) == 0)
     {
         return_code = OS_SUCCESS;
 
+        local   = OS_OBJECT_TABLE_GET(OS_impl_console_table, *token);
+        console = OS_OBJECT_TABLE_GET(OS_console_table, *token);
+
         if (console->IsAsync)
         {
             OS_DEBUG("%s(): Starting Async Console Handler\n", __func__);