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

neutrinoyparser.cpp, tuxboxapi: avoid possible crashes without g_bouquetManager instance

Browse Source 
This was observed without physical frontends and in certain
circumstances while using the web interface, e.g. if users are
using bouquet functionalities.
This commit is contained in:
Thilo Graf
2022-11-07 21:22:45 +01:00
parent 6be906e12d
commit 38b29d3c0e
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -1414,6 +1414,9 @@ std::string CControlAPI::_GetBouquetWriteItem(CyhookHandler *hh, CZapitChannel *
//-------------------------------------------------------------------------
void CControlAPI::GetBouquetCGI(CyhookHandler *hh)
{
if (g_bouquetManager == NULL)
return;
TOutType outType = hh->outStart(true /*old mode*/);
std::string result = "";
@@ -2155,6 +2158,9 @@ void CControlAPI::ReloadNeutrinoSetupCGI(CyhookHandler *hh)
void CControlAPI::ReloadPluginsCGI(CyhookHandler *hh)
{
if (g_Plugins == NULL)
return;
g_Plugins->loadPlugins();
hh->SendOk();
}

19
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -217,6 +217,9 @@ std::string CNeutrinoYParser::func_get_bouquets_as_dropdown(CyhookHandler *, st
std::string yresult, sel, nr_str, do_show_hidden;
int nr=1;
if (g_bouquetManager == NULL)
return "0";
ySplitString(para," ",nr_str, do_show_hidden);
if(!nr_str.empty())
nr = atoi(nr_str.c_str());
@@ -244,6 +247,9 @@ std::string CNeutrinoYParser::func_get_bouquets_as_dropdown(CyhookHandler *, st
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_bouquets_as_templatelist(CyhookHandler *, std::string para)
{
if (g_bouquetManager == NULL)
return "";
std::string yresult, ytemplate, do_show_hidden;
ySplitString(para,"~",ytemplate, do_show_hidden);
@@ -268,6 +274,9 @@ std::string CNeutrinoYParser::func_get_bouquets_as_templatelist(CyhookHandler *
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_get_actual_bouquet_number(CyhookHandler *, std::string)
{
if (g_bouquetManager == NULL)
return "0";
int actual=0;
for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) {
if(g_bouquetManager->existsChannelInBouquet(i, CZapit::getInstance()->GetCurrentChannelID())) {
@@ -320,6 +329,10 @@ std::string CNeutrinoYParser::func_get_channels_as_dropdown(CyhookHandler *, st
std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std::string para)
{
int BouquetNr = 0;
if (g_bouquetManager == NULL)
return "0";
std::string abnumber, tmp,yresult;
ZapitChannelList channels;
//int num;
@@ -1125,6 +1138,9 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
hh->ParamList["timer_repeatCount"] = itoa(timer.repeatCount);
// program row
if (g_bouquetManager == NULL)
return "";
t_channel_id current_channel = (cmd == "new") ? CZapit::getInstance()->GetCurrentChannelID() : timer.channel_id;
CBouquetManager::ChannelIterator cit = g_bouquetManager->tvChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) {
@@ -1174,6 +1190,9 @@ std::string CNeutrinoYParser::func_set_timer_form(CyhookHandler *hh, std::strin
//-------------------------------------------------------------------------
std::string CNeutrinoYParser::func_bouquet_editor_main(CyhookHandler *hh, std::string para)
{
if (g_bouquetManager == NULL)
return "0";
std::string yresult;
int selected = -1;
if (hh->ParamList["saved"] == "1")