Merge pull request #448 from nasa/fix-235-check-queue-maxdepth

Fix #235, add check against OS_MAX_QUEUE_DEPTH
nasa · May 19, 2020 · 2c69520 · 2c69520
2 parents a7a9955 + 8304ec1
commit 2c69520
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/os/inc/osapi-os-core.h b/src/os/inc/osapi-os-core.h
@@ -532,6 +532,7 @@ int32 OS_TaskFindIdBySystemData(uint32 *task_id, const void *sysdata, size_t sys
  * @retval #OS_ERR_NAME_TOO_LONG name length including null terminator greater than #OS_MAX_API_NAME
  * @retval #OS_ERR_NO_FREE_IDS if there are already the max queues created
  * @retval #OS_ERR_NAME_TAKEN if the name is already being used on another queue
+ * @retval #OS_QUEUE_INVALID_SIZE if the queue depth exceeds the limit
  * @retval #OS_ERROR if the OS create call fails
  */
 int32 OS_QueueCreate (uint32 *queue_id, const char *queue_name,

diff --git a/src/os/shared/src/osapi-queue.c b/src/os/shared/src/osapi-queue.c
@@ -102,6 +102,11 @@ int32 OS_QueueCreate (uint32 *queue_id, const char *queue_name, uint32 queue_dep
  return OS_ERR_NAME_TOO_LONG;
  }
 
+ if ( queue_depth > OS_QUEUE_MAX_DEPTH )
+ {
+ return OS_QUEUE_INVALID_SIZE;
+ }
+
  /* Note - the common ObjectIdAllocate routine will lock the object type and leave it locked. */
  return_code = OS_ObjectIdAllocateNew(LOCAL_OBJID_TYPE, queue_name, &local_id, &record);
  if(return_code == OS_SUCCESS)

diff --git a/src/unit-test-coverage/shared/src/coveragetest-queue.c b/src/unit-test-coverage/shared/src/coveragetest-queue.c
@@ -63,6 +63,10 @@ void Test_OS_QueueCreate(void)
  actual = OS_QueueCreate(&objid, "UT", 0, 0,0);
  UtAssert_True(actual == expected, "OS_QueueCreate() (%ld) == OS_ERR_NAME_TOO_LONG", (long)actual);
  UT_ClearForceFail(UT_KEY(OCS_strlen));
+
+ expected = OS_QUEUE_INVALID_SIZE;
+ actual = OS_QueueCreate(&objid, "UT", 1 + OS_QUEUE_MAX_DEPTH, 0,0);
+ UtAssert_True(actual == expected, "OS_QueueCreate() (%ld) == OS_QUEUE_INVALID_SIZE", (long)actual);
 }
 
 void Test_OS_QueueDelete(void)