UNLOZE/sm-ext-sourcetvmanager
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check IDemoRecorder pointer before use

Browse Source 
If the pointer to the IDemoRecorder instance fails to be found after an
update, don't try to use it blindly, but check if it's not null before..
This commit is contained in:
Peace-Maker 2016-04-28 15:45:20 +02:00
parent 30a83785bf
commit c0f634005d
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hltvserverwrapper.cpp
View File

@ -376,7 +376,7 @@ HLTVServerWrapper *HLTVServerWrapperManager::GetWrapper(IDemoRecorder *demorecor
for (unsigned int i = 0; i < m_HLTVServers.length(); i++)
{
HLTVServerWrapper *wrapper = m_HLTVServers[i];
if (wrapper->GetDemoRecorder() == demorecorder)
if (wrapper->GetDemoRecorder() != nullptr && wrapper->GetDemoRecorder() == demorecorder)
return wrapper;
}
return nullptr;

29
natives.cpp
View File

@ -446,6 +446,8 @@ static cell_t Native_ForceChaseCameraShot(IPluginContext *pContext, const cell_t
// native bool:SourceTV_IsRecording();
static cell_t Native_IsRecording(IPluginContext *pContext, const cell_t *params)
{
if (!hltvserver || !hltvserver->GetDemoRecorder())
return 0;
return hltvserver->GetDemoRecorder()->IsRecording();
}
@ -468,6 +470,10 @@ static cell_t Native_StartRecording(IPluginContext *pContext, const cell_t *para
// Only SourceTV Master can record demos instantly
if (!hltvserver->GetHLTVServer()->IsMasterProxy())
return 0;
// Failed to find the IDemoRecorder instance
if (!hltvserver->GetDemoRecorder())
return 0;
// already recording
if (hltvserver->GetDemoRecorder()->IsRecording())
@ -514,6 +520,14 @@ static cell_t Native_StartRecording(IPluginContext *pContext, const cell_t *para
// native bool:SourceTV_StopRecording();
static cell_t Native_StopRecording(IPluginContext *pContext, const cell_t *params)
{
if (hltvserver == nullptr)
return 0;
// Failed to find the IDemoRecorder instance
if (!hltvserver->GetDemoRecorder())
return 0;
// Not recording
if (!hltvserver->GetDemoRecorder()->IsRecording())
return 0;
@ -530,6 +544,14 @@ static cell_t Native_StopRecording(IPluginContext *pContext, const cell_t *param
// native bool:SourceTV_GetDemoFileName(String:sFilename[], maxlen);
static cell_t Native_GetDemoFileName(IPluginContext *pContext, const cell_t *params)
{
if (hltvserver == nullptr)
return 0;
// Failed to find the IDemoRecorder instance
if (!hltvserver->GetDemoRecorder())
return 0;
// Not recording
if (!hltvserver->GetDemoRecorder()->IsRecording())
return 0;
@ -549,6 +571,13 @@ static cell_t Native_GetDemoFileName(IPluginContext *pContext, const cell_t *par
// native SourceTV_GetRecordingTick();
static cell_t Native_GetRecordingTick(IPluginContext *pContext, const cell_t *params)
{
if (hltvserver == nullptr)
return -1;
// Failed to find the IDemoRecorder instance
if (!hltvserver->GetDemoRecorder())
return -1;
if (!hltvserver->GetDemoRecorder()->IsRecording())
return -1;