mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

avoid division by zero and fix segfault

Browse Source
This commit is contained in:
Jacek Jendrzej
2016-05-23 14:17:25 +02:00
parent 5b6421b8b0
commit 9f20b27890
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_draw.cpp
View File

@@ -431,7 +431,7 @@ bool CCDraw::CheckFbData(const cc_fbdata_t& fbdata, const char* func, const int
//screen area save //screen area save
fb_pixel_t* CCDraw::getScreen(int ax, int ay, int dx, int dy) fb_pixel_t* CCDraw::getScreen(int ax, int ay, int dx, int dy)
{ {
if (dx * dy == 0) if (dx < 1 || dy < 1 || dx * dy == 0)
return NULL; return NULL;
dprintf(DEBUG_INFO, "[CCDraw] INFO! [%s - %d], ax = %d, ay = %d, dx = %d, dy = %d\n", __func__, __LINE__, ax, ay, dx, dy); dprintf(DEBUG_INFO, "[CCDraw] INFO! [%s - %d], ax = %d, ay = %d, dx = %d, dy = %d\n", __func__, __LINE__, ax, ay, dx, dy);

4
src/gui/components/cc_item_picture.cpp
View File

@@ -216,7 +216,7 @@ void CComponentsPicture::initCCItem()
* by setters setWidth/setHeight * by setters setWidth/setHeight
* these steps are required to assign the current image dimensions to item dimensions * these steps are required to assign the current image dimensions to item dimensions
*/ */
if (keep_dx_aspect){ if (keep_dx_aspect && dy){
float h_ratio = float(height)*100/(float)dy; float h_ratio = float(height)*100/(float)dy;
width = int(h_ratio*(float)dx/100); width = int(h_ratio*(float)dx/100);
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_APOLLO
@@ -224,7 +224,7 @@ void CComponentsPicture::initCCItem()
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness; width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif #endif
} }
if (keep_dy_aspect){ if (keep_dy_aspect & dx){
float w_ratio = float(width)*100/(float)dx; float w_ratio = float(width)*100/(float)dx;
height = int(w_ratio*(float)dy/100); height = int(w_ratio*(float)dy/100);
} }