rpms/strigi/F-9 strigi-0.6.4-root-crash.patch, NONE, 1.1 strigi.spec, 1.20, 1.21

[Jaroslav Reznik]

Author: jreznik

Update of /cvs/pkgs/rpms/strigi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5576

Modified Files:
	strigi.spec 
Added Files:
	strigi-0.6.4-root-crash.patch 
Log Message:
* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
- fix crash with / char in path (#496620, kde#185551)


strigi-0.6.4-root-crash.patch:

--- NEW FILE strigi-0.6.4-root-crash.patch ---
diff -up strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash strigi-0.6.4/src/streamanalyzer/analysisresult.cpp
--- strigi-0.6.4/src/streamanalyzer/analysisresult.cpp.root-crash	2009-02-01 20:55:55.000000000 +0100
+++ strigi-0.6.4/src/streamanalyzer/analysisresult.cpp	2009-04-21 13:52:21.000000000 +0200
@@ -149,7 +149,15 @@ AnalysisResult::Private::Private(const s
     if (pos == std::string::npos) {
         m_name = m_path;
     } else {
-        assert(pos != m_path.size()-1); // make sure there is no trailing '/'
+        if (pos == m_path.size()-1) {
+            // assert that there is no trailing '/' unless it is part of a
+            // protocol, which means the parent must be "" and the string must
+            // end in a colon followed by up to three slashes
+            assert(m_parentpath == "");
+            int i = m_path.size();
+            while (--i > 0 && m_path[i] == '/') {}
+            assert(i > 0 && m_path[i] == ':');
+        }
         m_name = m_path.substr(pos+1);
     }
     // check that the path start with the path of the parent


Index: strigi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/strigi/F-9/strigi.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- strigi.spec	5 Mar 2009 12:43:05 -0000	1.20
+++ strigi.spec	21 Apr 2009 15:41:40 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		strigi
 Version:	0.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A desktop search program
 Group:		Applications/Productivity
 License:	LGPLv2+
@@ -10,6 +10,7 @@
 Source2:	strigi-daemon.desktop
 Patch0:		strigi-0.6.2-multilib.patch
 Patch1:		strigi-gcc44.patch
+Patch2:         strigi-0.6.4-root-crash.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cmake >= 2.4.5
@@ -55,6 +56,9 @@
 %patch0 -p1 -b .multilib
 %patch1 -p0 -b .gcc44
 
+# upstream patch, kde#185551
+%patch2 -p1 -b .root-crash
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -111,6 +115,9 @@
 %exclude %{_libdir}/strigi/*.cmake
 
 %changelog
+* Tue Apr 21 2009 Jaroslav Reznik <jreznik at redhat.com> - 0.6.4-4
+- fix crash with / char in path (#496620, kde#185551)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild