Sat Dec 17 14:18:32 2016 UTC ()
Fix pointer abuse.


(joerg)
diff -r1.3 -r1.4 pkgsrc/devel/tlsh/distinfo
diff -r0 -r1.1 pkgsrc/devel/tlsh/patches/patch-utils_rand__tags.cpp
cvs diff -r1.3 -r1.4 pkgsrc/devel/tlsh/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/tlsh/distinfo 2016/09/01 17:04:08 1.3
+++ pkgsrc/devel/tlsh/distinfo 2016/12/17 14:18:32 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2016/09/01 17:04:08 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2016/12/17 14:18:32 joerg Exp $
2 2
3SHA1 (tlsh-3.4.5.tar.gz) = 2d50b1e66ffbfd215f36648258d28be4171015c0 3SHA1 (tlsh-3.4.5.tar.gz) = 2d50b1e66ffbfd215f36648258d28be4171015c0
4RMD160 (tlsh-3.4.5.tar.gz) = a7f5f94d8113a6d6e24a84fe86b3d9dc93609757 4RMD160 (tlsh-3.4.5.tar.gz) = a7f5f94d8113a6d6e24a84fe86b3d9dc93609757
5SHA512 (tlsh-3.4.5.tar.gz) = 039f9fb9fb467a9b22f85a621c46069bac1745da039657840e1ff1a53901392fcf29d3c953b0f47d831d022a5e2594925c726d4ff921614418a3bb023a4ebbdc 5SHA512 (tlsh-3.4.5.tar.gz) = 039f9fb9fb467a9b22f85a621c46069bac1745da039657840e1ff1a53901392fcf29d3c953b0f47d831d022a5e2594925c726d4ff921614418a3bb023a4ebbdc
6Size (tlsh-3.4.5.tar.gz) = 1914815 bytes 6Size (tlsh-3.4.5.tar.gz) = 1914815 bytes
 7SHA1 (patch-utils_rand__tags.cpp) = 084f910f41e04aa214e62c3b2e430e27d0e14920
File Added: pkgsrc/devel/tlsh/patches/patch-utils_rand__tags.cpp
$NetBSD: patch-utils_rand__tags.cpp,v 1.1 2016/12/17 14:18:32 joerg Exp $

Checking for negative pointers doesn't make sense.

--- utils/rand_tags.cpp.orig	2016-12-16 17:30:02.495417195 +0000
+++ utils/rand_tags.cpp
@@ -366,7 +366,7 @@ struct tagdef oneoff_def[] = {
 
 static void rhtml_contents(std::string &htmls, int *ntags, int *ndistinct_tags)
 {
-	if ((*ntags <= 0) && (ndistinct_tags <= 0))
+	if ((*ntags <= 0) && (ndistinct_tags == 0))
 		return; 
 	if (random() % 10 == 1) {
 		anchor(htmls);