diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-02-12 09:07:02 +0100 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-02-12 16:37:55 +0000 |
commit | bdcac172eaa2ec4998c9f2775e691460b9b7a2d0 (patch) | |
tree | fce8f3fc4cee653f0edfe8ed93f1133474e66ea8 /epan/dissectors/packet-sip.c | |
parent | 678a9b6463b3661660da2e8a99781332c23cf78c (diff) |
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>
Diffstat (limited to 'epan/dissectors/packet-sip.c')
-rw-r--r-- | epan/dissectors/packet-sip.c | 18 |
1 files changed, 9 insertions, 9 deletions
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 */ |