mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

CComponents: prevent possible segfaults, remove redundant delete

Browse Source 
- if dx, dy == 0, it is not senseful to save screen.
- delete[] v_fbdata[i].pixbuf is also called in clear()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b299824d6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2013-12-22 20:07:33 +01:00
parent f2a0d3ee21
commit d30e17ddac
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/components/cc_base.cpp
View File

@@ -177,6 +177,9 @@ void CComponents::paintFbItems(bool do_save_bg)
//screen area save //screen area save
inline fb_pixel_t* CComponents::getScreen(int ax, int ay, int dx, int dy) inline fb_pixel_t* CComponents::getScreen(int ax, int ay, int dx, int dy)
{ {
if (dx * dy == 0)
return NULL;
fb_pixel_t* pixbuf = new fb_pixel_t[dx * dy]; fb_pixel_t* pixbuf = new fb_pixel_t[dx * dy];
frameBuffer->waitForIdle("CComponents::getScreen()"); frameBuffer->waitForIdle("CComponents::getScreen()");
frameBuffer->SaveScreen(ax, ay, dx, dy, pixbuf); frameBuffer->SaveScreen(ax, ay, dx, dy, pixbuf);
@@ -187,14 +190,13 @@ inline fb_pixel_t* CComponents::getScreen(int ax, int ay, int dx, int dy)
inline void CComponents::hide() inline void CComponents::hide()
{ {
for(size_t i =0; i< v_fbdata.size() ;i++) { for(size_t i =0; i< v_fbdata.size() ;i++) {
if (v_fbdata[i].pixbuf != NULL){ if (v_fbdata[i].pixbuf){
frameBuffer->waitForIdle("CComponents::hide()"); frameBuffer->waitForIdle("CComponents::hide()");
frameBuffer->RestoreScreen(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].pixbuf); frameBuffer->RestoreScreen(v_fbdata[i].x, v_fbdata[i].y, v_fbdata[i].dx, v_fbdata[i].dy, v_fbdata[i].pixbuf);
delete[] v_fbdata[i].pixbuf;
v_fbdata[i].pixbuf = NULL;
} }
} }
v_fbdata.clear();
clear();
is_painted = false; is_painted = false;
} }
@@ -212,7 +214,7 @@ void CComponents::kill()
inline void CComponents::clear() inline void CComponents::clear()
{ {
for(size_t i =0; i< v_fbdata.size() ;i++) for(size_t i =0; i< v_fbdata.size() ;i++)
if (v_fbdata[i].pixbuf != NULL) if (v_fbdata[i].pixbuf)
delete[] v_fbdata[i].pixbuf; delete[] v_fbdata[i].pixbuf;
v_fbdata.clear(); v_fbdata.clear();
} }