mirror of
https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git
synced 2023-10-10 19:16:51 +02:00
Fixed null pointers
This commit is contained in:
parent
59a4969b3f
commit
1e9e200e8a
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: connectionVTP.c,v 1.7 2005/05/09 20:22:29 lordjaxom Exp $
|
* $Id: connectionVTP.c,v 1.8 2007/03/02 15:27:07 schmirl Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "server/connectionVTP.h"
|
#include "server/connectionVTP.h"
|
||||||
@ -168,10 +168,17 @@ bool cLSTEHandler::Next(bool &Last)
|
|||||||
if (m_Schedule != NULL) {
|
if (m_Schedule != NULL) {
|
||||||
cChannel *channel = Channels.GetByChannelID(m_Schedule->ChannelID(),
|
cChannel *channel = Channels.GetByChannelID(m_Schedule->ChannelID(),
|
||||||
true);
|
true);
|
||||||
|
if (channel != NULL) {
|
||||||
m_State = Event;
|
m_State = Event;
|
||||||
return m_Client->Respond(-215, "C %s %s",
|
return m_Client->Respond(-215, "C %s %s",
|
||||||
*channel->GetChannelID().ToString(),
|
*channel->GetChannelID().ToString(),
|
||||||
channel->Name());
|
channel->Name());
|
||||||
|
} else {
|
||||||
|
esyslog("ERROR: vdr streamdev: unable to find channel %s by ID",
|
||||||
|
*m_Schedule->ChannelID().ToString());
|
||||||
|
m_State = EndChannel;
|
||||||
|
return Next(Last);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
m_State = EndEPG;
|
m_State = EndEPG;
|
||||||
return Next(Last);
|
return Next(Last);
|
||||||
@ -796,7 +803,11 @@ bool cConnectionVTP::CmdLSTX(cHandler *&Handler, char *Option)
|
|||||||
Handler = new cHandler(this, Option);
|
Handler = new cHandler(this, Option);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool last, result = Handler->Next(last);
|
bool last, result = false;
|
||||||
|
if (Handler != NULL)
|
||||||
|
result = Handler->Next(last);
|
||||||
|
else
|
||||||
|
esyslog("ERROR: vdr streamdev: Handler in LSTX command is NULL");
|
||||||
if (!result || last)
|
if (!result || last)
|
||||||
DELETENULL(Handler);
|
DELETENULL(Handler);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user