mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/neutrino.cpp init struct timer_remotebox_item, avoid segfault without InfoClock

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d12ea80c5b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-01 (Wed, 01 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-03-01 15:04:10 +01:00
parent c1140e0c1c
commit dab51889cb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -468,6 +468,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
if (timer_remotebox_itemcount) { if (timer_remotebox_itemcount) {
for (int i = 0; i < timer_remotebox_itemcount; i++) { for (int i = 0; i < timer_remotebox_itemcount; i++) {
timer_remotebox_item timer_rb; timer_remotebox_item timer_rb;
memset(&timer_rb, 0, sizeof(struct timer_remotebox_item));
std::string k; std::string k;
k = "timer_remotebox_ip_" + to_string(i); k = "timer_remotebox_ip_" + to_string(i);
timer_rb.rbaddress = configfile.getString(k, ""); timer_rb.rbaddress = configfile.getString(k, "");
@@ -4237,9 +4238,10 @@ void stop_daemons(bool stopall, bool for_flash)
if(!for_flash && !stopall && g_settings.hdmi_cec_mode && g_settings.hdmi_cec_standby){ if(!for_flash && !stopall && g_settings.hdmi_cec_mode && g_settings.hdmi_cec_standby){
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0); videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
} }
if(InfoClock)
delete InfoClock; delete InfoClock;
delete FileTimeOSD; if(FileTimeOSD)
delete FileTimeOSD;
delete &CMoviePlayerGui::getInstance(); delete &CMoviePlayerGui::getInstance();
CZapit::getInstance()->Stop(); CZapit::getInstance()->Stop();