cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport fix for crash due to uninitialized memory in network_tcp.

Browse Source 
Use the variant of the CMakeLists.txt patch that has been commited
upstream.
This commit is contained in:
bluhm 2020-04-01 15:32:44 +00:00
parent 742d3988d4
commit b8a592b1bb
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/open62541/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2020/02/13 22:19:35 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2020/04/01 15:32:44 bluhm Exp $
COMMENT = library implementation of OPC UA
VERSION = 1.0.1
REVISION = 0
REVISION = 1
PKGNAME = open62541-${VERSION}
GH_ACCOUNT = open62541

15
misc/open62541/patches/patch-arch_network_tcp_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-arch_network_tcp_c,v 1.1 2020/04/01 15:32:44 bluhm Exp $
https://github.com/open62541/open62541/commit/f9ceec7be7940495cf2ee091bed1bb5acec74551
Index: arch/network_tcp.c
--- arch/network_tcp.c.orig
+++ arch/network_tcp.c
@@ -775,6 +775,7 @@ UA_ClientConnectionTCP_init(UA_ConnectionConfig config
TCPClientConnection *tcpClientConnection = (TCPClientConnection*) UA_malloc(
sizeof(TCPClientConnection));
+ memset(tcpClientConnection, 0, sizeof(TCPClientConnection));
connection.handle = (void*) tcpClientConnection;
tcpClientConnection->timeout = timeout;
UA_String hostnameString = UA_STRING_NULL;

32
misc/open62541/patches/patch-tests_CMakeLists_txt
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-tests_CMakeLists_txt,v 1.1.1.1 2020/02/11 10:35:25 bluhm Exp $
$OpenBSD: patch-tests_CMakeLists_txt,v 1.2 2020/04/01 15:32:44 bluhm Exp $
There is no libsubunit port for OpenBSD.
Includes for libcheck were not found.
https://github.com/open62541/open62541/commit/71738ec1ed9f1ba32bdb52650a103d72cb8f6d1d
Index: tests/CMakeLists.txt
--- tests/CMakeLists.txt.orig
@ -15,11 +14,28 @@ Index: tests/CMakeLists.txt
list(APPEND LIBS subunit)
endif()
@@ -12,6 +12,7 @@ if(NOT MSVC AND UA_ENABLE_UNIT_TESTS_MEMCHECK)
@@ -11,11 +11,6 @@ if(NOT MSVC AND UA_ENABLE_UNIT_TESTS_MEMCHECK)
find_package(Valgrind REQUIRED)
endif()
if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
+ include_directories(/usr/local/include)
link_directories(/usr/local/lib)
add_definitions(-Wno-gnu-zero-variadic-macro-arguments)
-if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
- link_directories(/usr/local/lib)
- add_definitions(-Wno-gnu-zero-variadic-macro-arguments)
-endif()
-
if(APPLE)
# CLang on Apple complains about many cases like this:
# /Users/travis/build/open62541/open62541/tests/check_chunking.c:148:22: warning: implicit conversion changes signedness: 'size_t' (aka 'unsigned long') to 'intmax_t' (aka 'long') [-Wsign-conversion]
@@ -36,6 +31,12 @@ include_directories("${PROJECT_BINARY_DIR}")
if(UA_ENABLE_ENCRYPTION)
# mbedtls includes
include_directories(${MBEDTLS_INCLUDE_DIRS})
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
+ include_directories(AFTER /usr/local/include)
+ link_directories(AFTER /usr/local/lib)
+ add_definitions(-Wno-gnu-zero-variadic-macro-arguments)
endif()
add_definitions(-DUA_sleep_ms=UA_comboSleep)