From 8210ccba08072a58c750c8f85160c8825f4708f7 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 22 Jan 2025 10:08:55 +0000 Subject: [PATCH 1/3] sll_protocol may be be16 Google's fuzzer platform blows a warning /src/libwebsockets/lib/plat/unix/unix-sockets.c:497:21: warning: implicit conversion loses integer precision: 'uint32_t' (aka 'unsigned int') to '__be16' (aka 'unsigned short') [-Wimplicit-int-conversion] 497 | sll.sll_protocol = (uint32_t)(htons((uint16_t)0x800)); From e0c312c20248b2c7f509216e3b3463dc372fc114 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 22 Jan 2025 10:15:29 +0000 Subject: [PATCH 2/3] google-fuzzer: avoid warnings about c / c++ size diff --- lib/secure-streams/private-lib-secure-streams.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/secure-streams/private-lib-secure-streams.h b/lib/secure-streams/private-lib-secure-streams.h index 332e16634..c46af3218 100644 --- a/lib/secure-streams/private-lib-secure-streams.h +++ b/lib/secure-streams/private-lib-secure-streams.h @@ -132,17 +132,17 @@ typedef struct lws_ss_handle { union { struct { /* LWSSSP_H1 */ -#if defined(WIN32) +#if defined(WIN32) || defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) uint8_t dummy; #endif } h1; struct { /* LWSSSP_H2 */ -#if defined(WIN32) +#if defined(WIN32) || defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) uint8_t dummy; #endif } h2; struct { /* LWSSSP_WS */ -#if defined(WIN32) +#if defined(WIN32) || defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) uint8_t dummy; #endif } ws; From e0ecf9c66caf25ad053c7c1585cf90472be75837 Mon Sep 17 00:00:00 2001 From: Vikram Dattu Date: Wed, 5 Feb 2025 14:35:37 +0530 Subject: [PATCH 3/3] ESP-IDF: Removed explicit `esp_task_wdt_reset` call - Also removed some esp_wdt specific unnecessary header includes --- lib/plat/freertos/freertos-service.c | 9 +-------- lib/plat/freertos/private-lib-plat-freertos.h | 1 - .../embedded/esp32/esp-c3dev/private-lib-plat-freertos.h | 1 - minimal-examples/embedded/lhp/main.h | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/plat/freertos/freertos-service.c b/lib/plat/freertos/freertos-service.c index 9cb7322ea..cdd94d9f4 100644 --- a/lib/plat/freertos/freertos-service.c +++ b/lib/plat/freertos/freertos-service.c @@ -27,16 +27,9 @@ int lws_plat_service(struct lws_context *context, int timeout_ms) { - int n = _lws_plat_service_tsi(context, timeout_ms, 0); - -#if !defined(LWS_AMAZON_RTOS) && defined(LWS_ESP_PLATFORM) && defined(CONFIG_ESP_INT_WDT) - esp_task_wdt_reset(); -#endif - - return n; + return _lws_plat_service_tsi(context, timeout_ms, 0); } - int _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi) { diff --git a/lib/plat/freertos/private-lib-plat-freertos.h b/lib/plat/freertos/private-lib-plat-freertos.h index 9e2d904b4..6d1bed9a3 100644 --- a/lib/plat/freertos/private-lib-plat-freertos.h +++ b/lib/plat/freertos/private-lib-plat-freertos.h @@ -69,7 +69,6 @@ #endif #endif #include - #include #endif #if defined(LWS_WITH_ESP32) diff --git a/minimal-examples/embedded/esp32/esp-c3dev/private-lib-plat-freertos.h b/minimal-examples/embedded/esp32/esp-c3dev/private-lib-plat-freertos.h index ea61e5c90..072feef75 100644 --- a/minimal-examples/embedded/esp32/esp-c3dev/private-lib-plat-freertos.h +++ b/minimal-examples/embedded/esp32/esp-c3dev/private-lib-plat-freertos.h @@ -64,7 +64,6 @@ gai_strerror(int); #include "freertos/timers.h" #include #include - #include #endif #if defined(LWS_WITH_ESP32) diff --git a/minimal-examples/embedded/lhp/main.h b/minimal-examples/embedded/lhp/main.h index d59d8cd05..713cc4901 100644 --- a/minimal-examples/embedded/lhp/main.h +++ b/minimal-examples/embedded/lhp/main.h @@ -5,7 +5,6 @@ #include "sdkconfig.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" -#include #include #include