rpms/htdig/devel htdig-3.2.0b6-htstat-segv.patch, NONE, 1.1 htdig.spec, 1.40, 1.41

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/htdig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32230

Modified Files:
	htdig.spec 
Added Files:
	htdig-3.2.0b6-htstat-segv.patch 
Log Message:
- fixed htstat sigsegv when number of words is zero


htdig-3.2.0b6-htstat-segv.patch:

--- NEW FILE htdig-3.2.0b6-htstat-segv.patch ---
--- htdig-3.2.0b6/httools/htstat.cc.orig
+++ htdig-3.2.0b6/httools/htstat.cc
@@ -158,7 +158,8 @@
     if(words.Open(config->Find("word_db"), O_RDONLY) == OK)
       {
 	cout << "htstat: Total words: " << words.WordRefs()->Count() << endl;
-	cout << "htstat: Total unique words: " << words.Words()->Count() << endl;
+	if (words.WordRefs()->Count() != 0)
+	  cout << "htstat: Total unique words: " << words.Words()->Count() << endl;
 	words.Close();
       }
 


Index: htdig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/htdig/devel/htdig.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- htdig.spec	5 Dec 2007 12:35:07 -0000	1.40
+++ htdig.spec	30 Jan 2008 12:04:39 -0000	1.41
@@ -5,7 +5,7 @@
 Summary: ht://Dig - Web search engine
 Name: htdig
 Version: 3.2.0b6
-Release: 14%{?dist}
+Release: 15%{?dist}
 Epoch: 3
 License: GPLv2
 Group: Applications/Internet
@@ -25,6 +25,7 @@
 Patch9: htdig-3.2.0b6-opts.patch
 Patch11: htdig-3.2.0b6-incremental.patch
 Patch12: htdig-3.2-CVE-2007-6110.patch
+Patch13: htdig-3.2.0b6-htstat-segv.patch
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: zlib-devel httpd openssl-devel
 BuildRoot: %{_tmppath}/%{name}-root
@@ -79,6 +80,7 @@
 %patch9 -p1 -b .opts
 %patch11 -p1 -b .incremental
 %patch12 -p1 -b .CVE-2007-6110
+%patch13 -p1 -b .htstat-segv
 
 %build
 %configure \
@@ -149,6 +151,9 @@
 %endif
 
 %changelog
+* Wed Jan 30 2008 Adam Tkac <atkac redhat com> 3:3.2.0b6-15
+- fixed htstat sigsegv when number of words is zero
+
 * Wed Dec 05 2007 Adam Tkac <atkac redhat com> 3:3.2.0b6-14
 - rebuild against new openssl