diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-01-29 13:06:03 -0500 |
|---|---|---|
| committer | Hadriel Kaplan <hadrielk@yahoo.com> | 2015-01-29 19:11:29 +0000 |
| commit | 9a366b0476267ed68b9704e84b966ba7fa1c1b19 (patch) | |
| tree | de5044e47b01182186a51107cb68d2badf05d53b /wsutil/ws_mempbrk.c | |
| parent | 0137f9226a4ff1f75c5d8b83bf3a52243a44e088 (diff) | |
| download | wireshark-9a366b0476267ed68b9704e84b966ba7fa1c1b19.tar.gz wireshark-9a366b0476267ed68b9704e84b966ba7fa1c1b19.tar.bz2 wireshark-9a366b0476267ed68b9704e84b966ba7fa1c1b19.zip | |
Disable SSE4.2 _ws_mempbrk_sse42 due to bug 10798
This is a (possibly) temporary change to master to
disable _ws_mempbrk_sse42 to see if that fixes bug
10798.
Ping-Bug: 10798
Change-Id: I2e438ff299f55709c66a37634d2a7e799c513ac9
Reviewed-on: https://code.wireshark.org/review/6844
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
Diffstat (limited to 'wsutil/ws_mempbrk.c')
| -rw-r--r-- | wsutil/ws_mempbrk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wsutil/ws_mempbrk.c b/wsutil/ws_mempbrk.c index 982e924fc0..72cd99988f 100644 --- a/wsutil/ws_mempbrk.c +++ b/wsutil/ws_mempbrk.c @@ -60,8 +60,11 @@ ws_mempbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles) if G_UNLIKELY(have_sse42 < 0) have_sse42 = ws_cpuid_sse42(); +/* +Commented out due to bug 10798 if (haystacklen >= 16 && have_sse42) return _ws_mempbrk_sse42(haystack, haystacklen, needles); +*/ #endif return _ws_mempbrk(haystack, haystacklen, needles); |