mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: fix crashes on invalid fonts

Browse Source 
with the latest fontrenderer fix, invalid fonts now can lead to
division by zero errors. fix the occurences I found.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@43 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2009-12-13 12:25:38 +00:00
parent 5345573e5e
commit 83d7657b9d
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/channellist.cpp
View File

@@ -451,6 +451,8 @@ int CChannelList::show()
if(theight < PIC_H) theight = PIC_H;
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->getHeight();
if (fheight == 0)
fheight = 1; /* avoid crash on invalid font */
listmaxshow = (height - theight - buttonHeight -0)/fheight;
height = theight + buttonHeight + listmaxshow * fheight;
//info_height = fheight + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight() + 10;

2
src/gui/filebrowser.cpp
View File

@@ -386,6 +386,8 @@ void CFileBrowser::commonInit()
theight = g_Font[SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE]->getHeight();
fheight = g_Font[SNeutrinoSettings::FONT_TYPE_FILEBROWSER_ITEM]->getHeight();
if (fheight == 0)
fheight = 1; /* avoid div by zero on invalid font */
foheight = 30;
liststart = 0;

5
src/gui/widget/hintbox.cpp
View File

@@ -79,7 +79,10 @@ CHintBox::CHintBox(const neutrino_locale_t Caption, const char * const Text, con
else
break;
}
entries_per_page = ((height - theight) / fheight) - 1;
if (fheight != 0)
entries_per_page = ((height - theight) / fheight) - 1;
else /* avoid division by zero */
entries_per_page = 1;
current_page = 0;
unsigned int additional_width;