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

controlapi/getchannel: fix possible crash when channel = NULL

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72cec30e97
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-24 (Wed, 24 Feb 2016)

Origin message was:
------------------
- controlapi/getchannel: fix possible crash when channel = NULL

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-02-24 16:40:28 +01:00
parent 497e31b83a
commit 2c9f54f9b1
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1298,6 +1298,8 @@ void CControlAPI::GetChannelCGI(CyhookHandler *hh)
{ {
hh->outStart(); hh->outStart();
std::string result = "";
t_channel_id channel_id = 0; t_channel_id channel_id = 0;
if (hh->ParamList["id"].empty()) if (hh->ParamList["id"].empty())
channel_id = CZapit::getInstance()->GetCurrentChannelID(); channel_id = CZapit::getInstance()->GetCurrentChannelID();
@@ -1308,10 +1310,14 @@ void CControlAPI::GetChannelCGI(CyhookHandler *hh)
{ {
NeutrinoAPI->GetChannelEvents(); NeutrinoAPI->GetChannelEvents();
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
std::string result = _GetBouquetWriteItem(hh, channel, -1, -1); if (channel)
result = hh->outArray("channel", result); {
result = _GetBouquetWriteItem(hh, channel, -1, -1);
hh->SendResult(result); result = hh->outArray("channel", result);
hh->SendResult(result);
}
else
hh->SendError(hh->ParamList["id"] + " seems wrong");
} }
else else
hh->SendError(); hh->SendError();