mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: fbc873caf6
Author: Thilo Graf <dbt@novatux.de>
Date: 2022-11-15 (Tue, 15 Nov 2022)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2022-11-15 22:43:21 +01:00
committed by vanhofen
parent 5f251b06bc
commit b5afa1547c
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,6 +228,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());
@@ -255,6 +258,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);
@@ -279,6 +285,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())) {
@@ -331,6 +340,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;
@@ -1135,6 +1148,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++) {
@@ -1184,6 +1200,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")