BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87347
Change subject: bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix
......................................................................
bump netmapper patch to netmapper:b62b6c7a for assert(ip) fix
Change-Id: Ied267224d410864840b6e239cd03a7e0a27b67df
---
M debian/patches/0098-libvmod-netmapper-src.patch
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish
refs/changes/47/87347/1
diff --git a/debian/patches/0098-libvmod-netmapper-src.patch
b/debian/patches/0098-libvmod-netmapper-src.patch
index ccdbfc9..f826b44 100644
--- a/debian/patches/0098-libvmod-netmapper-src.patch
+++ b/debian/patches/0098-libvmod-netmapper-src.patch
@@ -1588,10 +1588,10 @@
+#endif // NLIST_H
diff --git a/lib/libvmod_netmapper/src/nlt/ntree.c
b/lib/libvmod_netmapper/src/nlt/ntree.c
new file mode 100644
-index 0000000..2e050d8
+index 0000000..7cef9da
--- /dev/null
+++ b/lib/libvmod_netmapper/src/nlt/ntree.c
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,176 @@
+/* Copyright © 2012 Brandon L Black <blbl...@gmail.com>
+ *
+ * This file is part of gdnsd-plugin-geoip.
@@ -1708,8 +1708,7 @@
+}
+
+static unsigned ntree_lookup_v4(const ntree_t* tree, const uint32_t ip) {
-+ assert(tree); assert(ip);
-+ assert(tree->ipv4);
++ assert(tree); assert(tree->ipv4);
+
+ unsigned chkbit = 0;
+ unsigned offset = tree->ipv4;
--
To view, visit https://gerrit.wikimedia.org/r/87347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied267224d410864840b6e239cd03a7e0a27b67df
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish
Gerrit-Branch: testing/3.0.3plus-rc1
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
