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

neutrino: fix compiler warnings / potential overruns in CRecordManager

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1822 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-11-05 11:39:02 +00:00
parent 98b3f1e501
commit 2643b9d0ab
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver/record.cpp
View File

@@ -1184,9 +1184,11 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey )
printf("CRecordManager::exec(ExitAll line %d) found channel %llx recording_id %d\n", __LINE__, channel_ids[i], recording_ids[i]); printf("CRecordManager::exec(ExitAll line %d) found channel %llx recording_id %d\n", __LINE__, channel_ids[i], recording_ids[i]);
i++; i++;
} }
if (i >= RECORD_MAX_COUNT)
break;
} }
mutex.unlock(); mutex.unlock();
if (i > 0) if (i > 0 && i < RECORD_MAX_COUNT)
{ {
for(int i2 = 0; i2 < i; i2++) for(int i2 = 0; i2 < i; i2++)
{ {
@@ -1248,8 +1250,8 @@ bool CRecordManager::ShowMenu(void)
char cnt[5]; char cnt[5];
CMenuForwarderNonLocalized * item; CMenuForwarderNonLocalized * item;
CMenuForwarder * iteml; CMenuForwarder * iteml;
t_channel_id channel_ids[RECORD_MAX_COUNT]; t_channel_id channel_ids[RECORD_MAX_COUNT] = { 0 }; /* initialization avoids false "might */
int recording_ids[RECORD_MAX_COUNT]; int recording_ids[RECORD_MAX_COUNT] = { 0 }; /* be used uninitialized" warning */
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select); CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
@@ -1300,6 +1302,8 @@ bool CRecordManager::ShowMenu(void)
//if only one recording is running, set the focus to this menu item //if only one recording is running, set the focus to this menu item
menu.addItem(item, rec_count == 1 ? true: false); menu.addItem(item, rec_count == 1 ? true: false);
i++; i++;
if (i >= RECORD_MAX_COUNT)
break;
} }
if(i > 1) //menu item "stopp all records" if(i > 1) //menu item "stopp all records"
{ {
@@ -1317,7 +1321,7 @@ bool CRecordManager::ShowMenu(void)
menu.exec(NULL, ""); menu.exec(NULL, "");
delete selector; delete selector;
if (select >= 0) { if (select >= 0 && select < RECORD_MAX_COUNT) {
/* in theory, timer event can expire while we in menu ? lock and check again */ /* in theory, timer event can expire while we in menu ? lock and check again */
mutex.lock(); mutex.lock();
CRecordInstance * inst = FindInstance(channel_ids[select]); CRecordInstance * inst = FindInstance(channel_ids[select]);