OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Libevent: Remove double free and update library to master (#254)

pull/262/head
Dmitry Ilyin 2022-07-04 17:47:55 +03:00 committed by GitHub
parent c4e486267a
commit c97e99b22c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
general/package/libevent-openipc/0001-libevent-mbedtls.patch
View File

@ -11,19 +11,3 @@ index 822d97a5..646763b4 100644
PROT_READ, PROT_READ,
#ifdef MAP_NOCACHE #ifdef MAP_NOCACHE
MAP_NOCACHE | /* ??? */ MAP_NOCACHE | /* ??? */
diff --git a/bufferevent_mbedtls.c b/bufferevent_mbedtls.c
index f42da2ae..61f448a2 100644
--- a/bufferevent_mbedtls.c
+++ b/bufferevent_mbedtls.c
@@ -57,8 +57,10 @@ static void
mbedtls_context_free(void *ssl, int flags)
{
struct mbedtls_context *ctx = ssl;
- if (flags & BEV_OPT_CLOSE_ON_FREE)
+ if (flags & BEV_OPT_CLOSE_ON_FREE) {
mbedtls_ssl_free(ctx->ssl);
+ free(ctx->ssl);
+ }
mm_free(ctx);
}
static int

4
general/package/libevent-openipc/libevent-openipc.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBEVENT_OPENIPC_VERSION = 2db55e43cffd2fb6a34b5c997f2b8d043ca0ece5 LIBEVENT_OPENIPC_VERSION = bf3ce77f6cf113839defa70b30e183d471a0dab5
LIBEVENT_OPENIPC_SITE = $(call github,libevent,libevent,$(LIBEVENT_OPENIPC_VERSION)) LIBEVENT_OPENIPC_SITE = $(call github,libevent,libevent,$(LIBEVENT_OPENIPC_VERSION))
LIBEVENT_OPENIPC_INSTALL_STAGING = YES LIBEVENT_OPENIPC_INSTALL_STAGING = YES
LIBEVENT_OPENIPC_LICENSE = BSD-3-Clause, OpenBSD LIBEVENT_OPENIPC_LICENSE = BSD-3-Clause, OpenBSD
@ -54,7 +54,7 @@ endif
ifeq ($(BR2_PACKAGE_MBEDTLS_OPENIPC),y) ifeq ($(BR2_PACKAGE_MBEDTLS_OPENIPC),y)
LIBEVENT_OPENIPC_DEPENDENCIES += host-pkgconf mbedtls-openipc LIBEVENT_OPENIPC_DEPENDENCIES += host-pkgconf mbedtls-openipc
LIBEVENT_OPENIPC_CONF_OPTS += --enable-embedtls LIBEVENT_OPENIPC_CONF_OPTS += --enable-mbedtls
else else
LIBEVENT_OPENIPC_CONF_OPTS += --disable-mbedtls LIBEVENT_OPENIPC_CONF_OPTS += --disable-mbedtls
endif endif