Merge pull request nasa#361 from nasa/ic-20200226

Integration Candidate 20200226
skliper · Feb 28, 2020 · a1e9dbf · a1e9dbf
2 parents 8239eb5 + 7d1f33d
commit a1e9dbf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,9 @@ This distribution contains:
 
 Version Notes:
 ==============
-
+- 5.0.7: DEVELOPMENT
+  - Fixes memset bug
+  - Minor updates (see https://github.com/nasa/osal/pull/361)
 - 5.0.6: DEVELOPMENT
   - Minor updates (see https://github.com/nasa/osal/pull/355)
 - 5.0.5: DEVELOPMENT
@@ -117,4 +119,3 @@ License information:
 ==================== 
 
 This software is licensed under NASAs Open Source Agreement. The release of the software is conditional upon the recipients acceptance of the Open Source Agreement. Please see the file: NASA_Open_Source_Agreement_1_3-OS_AbstractionLayer.txt
-
diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h
@@ -20,7 +20,7 @@
 
 #define OS_MAJOR_VERSION 5
 #define OS_MINOR_VERSION 0
-#define OS_REVISION      6
+#define OS_REVISION      7
 #define OS_MISSION_REV   0
 
 /**

diff --git a/src/os/posix/osapi.c b/src/os/posix/osapi.c
@@ -1465,6 +1465,8 @@ int32 OS_BinSemCreate_Impl (uint32 sem_id, uint32 initial_value, uint32 options)
     mutex_created = 0;
     cond_created = 0;
     sem = &OS_impl_bin_sem_table[sem_id];
+    memset(sem, 0, sizeof (*sem));
+
     do
     {
         /*
@@ -1522,7 +1524,6 @@ int32 OS_BinSemCreate_Impl (uint32 sem_id, uint32 initial_value, uint32 options)
          ** fill out the proper OSAL table fields
          */
 
-        memset(sem, 0, sizeof (*sem));
         sem->current_value = initial_value;
 
         return_code = OS_SUCCESS;