From 26d4249a3f23f98896e92081cca79b9389bdcbcc Mon Sep 17 00:00:00 2001
From: Andy Green <andy.green@linaro.org>
Date: Wed, 24 Feb 2016 12:40:21 +0800
Subject: [PATCH] ws union member must have actual struct at start not pointer
Signed-off-by: Andy Green <andy.green@linaro.org>
---
changelog | 3 +++
lib/private-libwebsockets.h | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 9267d20c..347b778e 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,9 @@ Fixes
get sent a content-length resulting in the link hanging until the peer closed
it. attack.sh updated to add a test for this.
+3) MINOR An error about hdr struct in _lws_ws_related is corrected, it's not
+known to affect anything until after it was fixed
+
Changes
-------
diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h
index cd4cd80b..af62e8ff 100644
--- a/lib/private-libwebsockets.h
+++ b/lib/private-libwebsockets.h
@@ -953,7 +953,7 @@ struct _lws_header_related {
struct _lws_websocket_related {
/* cheapest way to deal with ah overlap with ws union transition */
- struct _lws_header_related *hdr;
+ struct _lws_header_related hdr;
char *rx_ubuf;
unsigned int rx_ubuf_alloc;
struct lws *rx_draining_ext_list;
--
GitLab