Fix MISRA rule 22-1. (#1765)

* Fix MISRA rule 22-1. * update CI config with MISRA rule 22-1. --------- Co-authored-by: eboasson <[email protected]>
eclipse-cyclonedds · Jul 24, 2023 · b0eb340 · b0eb340
1 parent 8d120b9
commit b0eb340
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/.github/codeql/resolved-misra-rules.yml b/.github/codeql/resolved-misra-rules.yml
@@ -12,4 +12,6 @@ queries:
   - uses: ./codeql-coding-standards/c/misra/src/rules/RULE-22-8/ErrnoSetToZeroPriorToCall.ql
   - uses: ./codeql-coding-standards/c/misra/src/rules/RULE-8-3/DeclarationsOfAFunctionSameNameAndType.ql #[1/2]
 #  - uses: ./codeql-coding-standards/c/misra/src/rules/RULE-8-3/DeclarationsOfAnObjectSameNameAndType.ql #[2/2]
+  - uses: ./codeql-coding-standards/c/misra/src/rules/RULE-22-1/CloseFileHandleWhenNoLongerNeededMisra.ql
+  - uses: ./codeql-coding-standards/c/misra/src/rules/RULE-22-1/FreeMemoryWhenNoLongerNeededMisra.ql
 #  - uses: ./codeql-coding-standards/c/misra/src/rules/RULE-11-1/ConversionBetweenFunctionPointerAndOtherType.ql
diff --git a/src/ddsrt/src/sockets.c b/src/ddsrt/src/sockets.c
@@ -392,6 +392,7 @@ ddsrt_gethostbyname(const char *name, int af, ddsrt_hostent_t **hentp)
           memcpy(&hent->addrs[addrno], res->ai_addr, res->ai_addrlen);
         }
       } else {
+        freeaddrinfo(res);
         return DDS_RETCODE_OUT_OF_RESOURCES;
       }
 

diff --git a/src/ddsrt/src/threads/posix/threads.c b/src/ddsrt/src/threads/posix/threads.c
@@ -635,6 +635,7 @@ dds_return_t ddsrt_thread_cleanup_push (void (*routine) (void * p), void *arg)
     tail->arg = arg;
     if ((err = pthread_setspecific(thread_cleanup_key, tail)) != 0) {
       assert(err != EINVAL);
+      ddsrt_free(tail); 
       return DDS_RETCODE_OUT_OF_RESOURCES;
     }
     return DDS_RETCODE_OK;