Fix crash at startup in SSE4.2 code when running a 32 bits Windows build

There is no guarantee that a g_malloc'ed memory block will be aligned on a 128 bits boundary
Instead use a static variable definition (at the cost of exposing the HAVE_SSE4_2 compilation flag in ws_mempbrk.h)

Change-Id: I661bf479a9d458d64c96bafc940c519d29a4780b
Reviewed-on: https://code.wireshark.org/review/7070
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

5 files changed, 15 insertions, 15 deletions

diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index 255bf970c5..42359bb741 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -104,7 +104,7 @@ static gint ett_cups = -1;
 static gint ett_cups_ptype = -1;
 
 /* patterns used for tvb_pbrk_pattern_guint8 */
-static tvb_pbrk_pattern pbrk_whitespace = INIT_PBRK_PATTERN;
+static tvb_pbrk_pattern pbrk_whitespace;
 
 /* This protocol is heavily related to IPP, but it is CUPS-specific
    and non-standard. */
diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c
index de201c235e..2d0b66f479 100644
--- a/epan/dissectors/packet-irc.c
+++ b/epan/dissectors/packet-irc.c
@@ -76,7 +76,7 @@ static expert_field ei_irc_tag_data_invalid = EI_INIT;
 /* This must be a null-terminated string */
 static const guint8 TAG_DELIMITER[] = {0x01, 0x00};
 /* patterns used for tvb_pbrk_pattern_guint8 */
-static tvb_pbrk_pattern pbrk_tag_delimiter = INIT_PBRK_PATTERN;
+static tvb_pbrk_pattern pbrk_tag_delimiter;
 
 
 #define TCP_PORT_IRC            6667
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 84bd157f56..91af614297 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -140,8 +140,8 @@ static dissector_handle_t megaco_text_handle;
 static int megaco_tap = -1;
 
 /* patterns used for tvb_pbrk_pattern_guint8 */
-static tvb_pbrk_pattern pbrk_whitespace = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_braces = INIT_PBRK_PATTERN;
+static tvb_pbrk_pattern pbrk_whitespace;
+static tvb_pbrk_pattern pbrk_braces;
 
 
 /*
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index cf7897dda7..166b8c30a1 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -198,8 +198,8 @@ static expert_field ei_sdp_invalid_line_space  = EI_INIT;
 static expert_field ei_sdp_invalid_conversion = EI_INIT;
 
 /* patterns used for tvb_pbrk_pattern_guint8 */
-static tvb_pbrk_pattern pbrk_digits = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_alpha = INIT_PBRK_PATTERN;
+static tvb_pbrk_pattern pbrk_digits;
+static tvb_pbrk_pattern pbrk_alpha;
 
 #define SDP_RTP_PROTO       0x00000001
 #define SDP_SRTP_PROTO      0x00000002
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index f34a157295..9fa6932045 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -238,15 +238,15 @@ static expert_field ei_sip_odd_register_response = EI_INIT;
 static expert_field ei_sip_sipsec_malformed = EI_INIT;
 
 /* patterns used for tvb_pbrk_pattern_guint8 */
-static tvb_pbrk_pattern pbrk_comma_semi = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_whitespace = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_param_end = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_param_end_colon_brackets = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_header_end_dquote = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_quotes = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_tab_sp_fslash = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_addr_end = INIT_PBRK_PATTERN;
-static tvb_pbrk_pattern pbrk_via_param_end = INIT_PBRK_PATTERN;
+static tvb_pbrk_pattern pbrk_comma_semi;
+static tvb_pbrk_pattern pbrk_whitespace;
+static tvb_pbrk_pattern pbrk_param_end;
+static tvb_pbrk_pattern pbrk_param_end_colon_brackets;
+static tvb_pbrk_pattern pbrk_header_end_dquote;
+static tvb_pbrk_pattern pbrk_quotes;
+static tvb_pbrk_pattern pbrk_tab_sp_fslash;
+static tvb_pbrk_pattern pbrk_addr_end;
+static tvb_pbrk_pattern pbrk_via_param_end;
 
 
 /* PUBLISH method added as per http://www.ietf.org/internet-drafts/draft-ietf-sip-publish-01.txt */