Remove some unreached/duplicated code. Add error checking for `atoi()` calls. About `isdigit()` and similar functions. The warning reported is: ``` Negative Character Value help isdigit() is invoked here with an argument of signed type char, but only has defined behavior for int arguments that are either representable as unsigned char or equal to the value of macro EOF(-1). Casting the argument to unsigned char will avoid the undefined behavior. In a number of libc implementations, isdigit() is implemented using lookup tables (arrays): passing in a negative value can result in a read underrun. ``` Switching to our macros fix that. Add a check to `check_symbols.sh` to avoid using the original functions from libc.
66 lines
2.2 KiB
Bash
Executable File
66 lines
2.2 KiB
Bash
Executable File
#!/usr/bin/env sh
|
|
|
|
set -e
|
|
|
|
SCRIPT_DIR="$(realpath $(dirname ${0}))"
|
|
NDPI_LIB="${1:-${SCRIPT_DIR}/../src/lib/libndpi.a}"
|
|
|
|
if [ ! -r "${NDPI_LIB}" ]; then
|
|
printf '%s\n' "${0}: nDPI static library '$(realpath ${NDPI_LIB})' not found."
|
|
exit 1
|
|
fi
|
|
|
|
FAIL_COUNT=0
|
|
CURRENT_OBJECT=''
|
|
for line in `nm -P -u "${NDPI_LIB}"`; do
|
|
OBJECT="$(printf '%s' "${line}" | grep -E "^${NDPI_LIB}\[.*\.o\]:" | grep -oE "\[.*\.o\]" || true)"
|
|
if [ ! -z "${OBJECT}" ]; then
|
|
CURRENT_OBJECT="${OBJECT}"
|
|
fi
|
|
|
|
#printf '%s\n' "${line}"
|
|
FOUND_SYMBOL="$(printf '%s' "${line}" | grep '^\(malloc\|calloc\|realloc\|free\|printf\|fprintf\|isdigit\|isalpha\|isalnum\|isspace\|isprint\|ispunct\)$' || true)"
|
|
|
|
if [ ! -z "${FOUND_SYMBOL}" ]; then
|
|
SKIP=0
|
|
case "${CURRENT_OBJECT}" in
|
|
'[ndpi_main.o]')
|
|
case "${FOUND_SYMBOL}" in
|
|
'printf'|'fprintf') SKIP=1 ;;
|
|
esac
|
|
;;
|
|
'[ahocorasick.o]'|'[ndpi_serializer.o]')
|
|
case "${FOUND_SYMBOL}" in
|
|
'fprintf') SKIP=1 ;;
|
|
esac
|
|
;;
|
|
'[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
|
|
FAIL_COUNT="$(expr ${FAIL_COUNT} + 1)"
|
|
printf '%s: %s\n' "${CURRENT_OBJECT}" "${FOUND_SYMBOL}"
|
|
fi
|
|
fi
|
|
done
|
|
|
|
printf 'Unwanted symbols found: %s\n' "${FAIL_COUNT}"
|
|
if [ ${FAIL_COUNT} -gt 0 ]; then
|
|
printf '%s\n' 'Please make sure to use only ndpi_malloc/ndpi_calloc/ndpi_realloc/ndpi_free/ndpi_isdigit/ndpi_isalpha/ndpi_isalnum/ndpi_isspace/ndpi_isprint/ndpi_ispunct wrapper instead of malloc/calloc/realloc/free/isdigit/isalpha/isalnum/isspace/isprint/ispunct'
|
|
fi
|
|
exit ${FAIL_COUNT}
|