summaryrefslogtreecommitdiffstats
path: root/tools/macos-setup-patches/snappy-signed.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:53 +0000
commita86c5f7cae7ec9a3398300555a0b644689d946a1 (patch)
tree39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /tools/macos-setup-patches/snappy-signed.patch
parentReleasing progress-linux version 4.2.6-1~progress7.99u1. (diff)
downloadwireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz
wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tools/macos-setup-patches/snappy-signed.patch')
-rw-r--r--tools/macos-setup-patches/snappy-signed.patch11
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/macos-setup-patches/snappy-signed.patch b/tools/macos-setup-patches/snappy-signed.patch
new file mode 100644
index 00000000..0018fcc4
--- /dev/null
+++ b/tools/macos-setup-patches/snappy-signed.patch
@@ -0,0 +1,11 @@
+--- snappy.cc.orig 2023-09-14 01:04:05
++++ snappy.cc 2023-09-14 01:04:28
+@@ -1290,7 +1290,7 @@
+ DeferMemCopy(&deferred_src, &deferred_length, from, len);
+ }
+ } while (ip < ip_limit_min_slop &&
+- (op + deferred_length) < op_limit_min_slop);
++ static_cast<ptrdiff_t>(op + deferred_length) < op_limit_min_slop);
+ exit:
+ ip--;
+ assert(ip <= ip_limit);