Fixed invalid use of ndpi_free(). Sorry, my fault. (#1988)

* Fixed invalid use of ndpi_free(). Sorry, my fault. Signed-off-by: Toni Uhlig <[email protected]> * Fine tuned symbol check script. * added check for expected syms in modules Signed-off-by: Toni Uhlig <[email protected]> --------- Signed-off-by: Toni Uhlig <[email protected]>
ntop · May 24, 2023 · 334b435 · 334b435
1 parent f692342
commit 334b435
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/lib/third_party/src/gcrypt/aesni.c b/src/lib/third_party/src/gcrypt/aesni.c
@@ -97,7 +97,7 @@ int mbedtls_aesni_has_support( unsigned int what )
 	  break; /* We giveup */
       }
 
-      ndpi_free(line);
+      free(line); // Do not replace with ndpi_free(). See `man 3 getline`.
       fclose(fd);
 
       has_aesni_checked = 1;

diff --git a/utils/check_symbols.sh b/utils/check_symbols.sh
@@ -24,7 +24,21 @@ for line in `nm -P -u "${NDPI_LIB}"`; do
     if [ ! -z "${FOUND_SYMBOL}" ]; then
         SKIP=0
         case "${CURRENT_OBJECT}" in
-            '[ndpi_utils.o]'|'[ndpi_memory.o]'|'[roaring.o]') SKIP=1 ;;
+            '[roaring.o]')
+                case "${FOUND_SYMBOL}" in
+                    'malloc'|'calloc'|'realloc'|'free') SKIP=1 ;;
+                esac
+            ;;
+            '[ndpi_utils.o]'|'[ndpi_memory.o]'|'[roaring.o]')
+                case "${FOUND_SYMBOL}" in
+                    'malloc'|'calloc'|'free') SKIP=1 ;;
+                esac
+            ;;
+            '[gcrypt_light.o]')
+                case "${FOUND_SYMBOL}" in
+                    'free') SKIP=1 ;;
+                esac
+            ;;
         esac
 
         if [ ${SKIP} -eq 0 ]; then