Fixes a crash when you are using two different protocols and move

through the tree.
This commit is contained in:
Lukas Tinkl 2008-05-27 17:15:57 +00:00
parent 1e99664b2d
commit b2c5a02313
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- kdelibs/kio/kio/kdirmodel.cpp 2008/05/27 15:27:46 813403
+++ kdelibs/kio/kio/kdirmodel.cpp 2008/05/27 15:27:57 813404
@@ -184,7 +184,7 @@
return qMakePair(row, *it);
}
// This used to be urlStr.startsWith(u.url()+'/'), but KUrl::url() is a slow operation.
- if ( pathStr.startsWith(u.path()+'/') ) {
+ if ( (url.protocol() == u.protocol()) && (pathStr.startsWith(u.path()+'/')) ) {
//kDebug(7008) << "going into " << node->item().url();
Q_ASSERT( isDir(*it) );
dirNode = static_cast<KDirModelDirNode *>( *it );

View File

@ -1,7 +1,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.0.4
Release: 9%{?dist}
Release: 10%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -97,6 +97,8 @@ Patch21: kdelibs-4.0.4-khtml-anonboxes.patch
# fix kdebug:48704: document.styleSheets.length does not return the correct number under all circumstances
# http://websvn.kde.org/?view=rev&revision=812538
Patch22: kdelibs-4.0.4-khtml-DOMStyleSheetList.patch
# http://websvn.kde.org/?view=rev&revision=813404
Patch23: kdelibs-4.0.4-kdirmodel-crash.patch
## upstream patches
@ -223,6 +225,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch20 -p1 -b .khtml-combobox
%patch21 -p1 -b .khtml-anonboxes
%patch22 -p1 -b .khtml-DOMStyleSheetList
%patch23 -p1 -b .kdirmodel-crash
%build
@ -383,6 +386,9 @@ rm -rf %{buildroot}
%changelog
* Tue May 27 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-10
- Fixes a crash when you are using two different protocols and move through the tree
* Tue May 27 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.4-9
- fix kdebug:161196: Drop-down list options display blank when a comment is added between option tags
- fix kdebug:156419: konqueror crash on http://pidgin.im/