Fix potential crash

pull/16/head
Timothy Pearson 13 years ago
parent 68fe6bbf61
commit 85a3c08c04

@ -1 +1 @@
Subproject commit 6092ca3fd1c345a94e4b634bc1a6370f735bcfd7
Subproject commit 42b03b0965a9e958b6007b49201b7793d2bd4f65

@ -135,15 +135,17 @@ bool KElfPlugin::readInfo( KFileMetaInfo& info, uint what)
{
// Failed to obtain a list of ELF icons
}
while((entry = get_nexticon(&icons, entry)) != NULL)
{
if (iconListing.isEmpty()) {
iconListing = entry->name;
}
else {
iconListing = iconListing.append("<p>").append(entry->name);
else {
while((entry = get_nexticon(&icons, entry)) != NULL)
{
if (iconListing.isEmpty()) {
iconListing = entry->name;
}
else {
iconListing = iconListing.append("<p>").append(entry->name);
}
break;
}
break;
}
if (iconListing.isEmpty()) {
iconListing = TQString("<i>") + i18n("not set") + TQString("</i>");

@ -674,12 +674,14 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
{
// Failed to obtain a list of ELF icons
}
while((entry = get_nexticon(&icons, entry)) != NULL)
{
if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
iconresnamefound = 1;
p = DesktopIcon( entry->name, _size, _state );
break;
else {
while((entry = get_nexticon(&icons, entry)) != NULL)
{
if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
iconresnamefound = 1;
p = DesktopIcon( entry->name, _size, _state );
break;
}
}
}

@ -222,12 +222,14 @@ TQString KURIFilterData::iconName()
{
// Failed to obtain a list of ELF icons
}
while((entry = get_nexticon(&icons, entry)) != NULL)
{
if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
iconresnamefound = 1;
m_strIconName = entry->name;
break;
else {
while((entry = get_nexticon(&icons, entry)) != NULL)
{
if (KGlobal::iconLoader()->iconPath(entry->name, 0, true) != "") {
iconresnamefound = 1;
m_strIconName = entry->name;
break;
}
}
}

Loading…
Cancel
Save