From e2cddc47c656a8e6aa100aac49978279c3079d57 Mon Sep 17 00:00:00 2001 From: Nicholas Brown Date: Wed, 27 May 2020 14:19:45 +0100 Subject: [PATCH 1/2] Add gcc-9 and gcc-10 to the travis builds --- .travis.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.travis.yml b/.travis.yml index 33b002b..ecb8f15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -130,6 +130,26 @@ matrix: - *required_packages - *optional_packages - g++-8 + - compiler: gcc-9 + env: + - DTLS="ON" ZMQ="ON" MYSQL="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=gcc-9 CXX=g++-9" + addons: + apt: + sources: *zeromq_source_and_toolchain_gcc + packages: + - *required_packages + - *optional_packages + - g++-9 + - compiler: gcc-10 + env: + - DTLS="ON" ZMQ="ON" MYSQL="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=gcc-10 CXX=g++-10" + addons: + apt: + sources: *zeromq_source_and_toolchain_gcc + packages: + - *required_packages + - *optional_packages + - g++-10 - compiler: clang env: From 4c1b3f365f9da26993157a9e0f4f49bf4d53da05 Mon Sep 17 00:00:00 2001 From: Nicholas Brown Date: Wed, 27 May 2020 15:45:04 +0100 Subject: [PATCH 2/2] Fix a stringop-truncation warning reported by gcc 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In function ‘strncpy’, inlined from ‘add_classid_to_signatureclass’ at /home/travis/build/nickbroon/vermont/src/modules/analysis/fpsigmatcher/Signature.c:204:2: /usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 50 equals destination size [-Werror=stringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- src/modules/analysis/fpsigmatcher/Signature.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/analysis/fpsigmatcher/Signature.c b/src/modules/analysis/fpsigmatcher/Signature.c index 284af88..7309758 100644 --- a/src/modules/analysis/fpsigmatcher/Signature.c +++ b/src/modules/analysis/fpsigmatcher/Signature.c @@ -201,7 +201,7 @@ void add_classid_to_signatureclass(struct SignatureClass * class, char * new_mem // I think that a class id is not added to a signature, but a signature id to a class. class->member_IDs = realloc(class->member_IDs, sizeof(char *) * (class->numOfMembers + 1)); class->member_IDs[class->numOfMembers] = malloc(sizeof(char) * ID_STRING_SIZE); - strncpy(class->member_IDs[class->numOfMembers], new_memberID, ID_STRING_SIZE); + strncpy(class->member_IDs[class->numOfMembers], new_memberID, ID_STRING_SIZE-1); class->member_IDs[class->numOfMembers][ID_STRING_SIZE-1] = '\0'; class->numOfMembers++; }