Merge pull request #1444 from nasa/integration-candidate

osal Integration candidate: Equuleus-rc1+dev2
nasa · Jan 18, 2024 · fed9ead · fed9ead
2 parents e3e336a + ac71a6b
commit fed9ead
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev37
+- Fix pointer error in OS_GetErrorName
+- See <https://github.com/nasa/osal/pull/1436>
+
 ## Development Build: equuleus-rc1+dev33
 - updating OSAL to use new versioning system
 - patch build for old RTEMS

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     33
+#define OS_BUILD_NUMBER     37
 #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-errors.c b/src/os/shared/src/osapi-errors.c
@@ -148,7 +148,7 @@ int32 OS_GetErrorName(int32 error_num, os_err_name_t *err_name)
     if (Error->Number == error_num && Error->Name != NULL)
     {
         strncpy(*err_name, Error->Name, sizeof(*err_name) - 1);
-        *err_name[sizeof(*err_name) - 1] = 0;
+        (*err_name)[sizeof(*err_name) - 1] = 0;
         return_code                      = OS_SUCCESS;
     }
     else