Project homepage Mailing List  Warmcat.com  API Docs  Github Mirror 
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1748875015, "reponame":"libwebsockets", "desc":"libwebsockets lightweight C networking library", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://libwebsockets.org/repo/libwebsockets", "f":3, "items": [ {"schema":"libjg2-1", "cid":"4ab7e6b86f9aa550eccf0d1bcc78ce88", "commit": {"type":"commit", "time": 1516922555, "time_ofs": 480, "oid_tree": { "oid": "23b50a53ba6ce881544632c2e0939cbe91bf501c", "alias": []}, "oid":{ "oid": "1b43ed1cbaf189fd1a2a5da21a282bd03284bb22", "alias": []}, "msg": "mbedtls wrapper: check for malloc.h before using", "sig_commit": { "git_time": { "time": 1516922555, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }, "sig_author": { "git_time": { "time": 1516922555, "offset": 480 }, "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" }}, "body": "mbedtls wrapper: check for malloc.h before using\n\nhttps://github.com/warmcat/libwebsockets/issues/1163" , "diff": "diff --git a/CMakeLists.txt b/CMakeLists.txt\nindex f1b6444..9055f13 100644\n--- a/CMakeLists.txt\n+++ b/CMakeLists.txt\n@@ -574,6 +574,7 @@ CHECK_INCLUDE_FILE(sys/types.h LWS_HAVE_SYS_TYPES_H)\n CHECK_INCLUDE_FILE(unistd.h LWS_HAVE_UNISTD_H)\n CHECK_INCLUDE_FILE(vfork.h LWS_HAVE_VFORK_H)\n CHECK_INCLUDE_FILE(sys/capability.h LWS_HAVE_SYS_CAPABILITY_H)\n+CHECK_INCLUDE_FILE(malloc.h LWS_HAVE_MALLOC_H)\n \n CHECK_LIBRARY_EXISTS(cap cap_set_flag \u0022\u0022 LWS_HAVE_LIBCAP) \n \ndiff --git a/cmake/lws_config.h.in b/cmake/lws_config.h.in\nindex f8a72cf..d74ef7e 100644\n--- a/cmake/lws_config.h.in\n+++ b/cmake/lws_config.h.in\n@@ -150,6 +150,8 @@\n #cmakedefine LWS_WITH_ACME\n #cmakedefine LWS_WITH_SELFTESTS\n \n+#cmakedefine LWS_HAVE_MALLOC_H\n+\n /* OpenSSL various APIs */\n \n #cmakedefine LWS_HAVE_TLS_CLIENT_METHOD\ndiff --git a/lib/tls/mbedtls/wrapper/include/platform/ssl_port.h b/lib/tls/mbedtls/wrapper/include/platform/ssl_port.h\nindex c4c2661..74c7634 100644\n--- a/lib/tls/mbedtls/wrapper/include/platform/ssl_port.h\n+++ b/lib/tls/mbedtls/wrapper/include/platform/ssl_port.h\n@@ -19,12 +19,11 @@\n extern \u0022C\u0022 {\n #endif\n \n-/*\n-#include \u0022esp_types.h\u0022\n-#include \u0022esp_log.h\u0022\n-*/\n #include \u0022string.h\u0022\n+#include \u0022stdlib.h\u0022\n+#if defined(LWS_HAVE_MALLOC_H)\n #include \u0022malloc.h\u0022\n+#endif\n \n void *ssl_mem_zalloc(size_t size);\n \n","s":{"c":1748875015,"u": 2533}} ],"g": 3247,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}