hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2017-12-11 11:49:31 +01:00
commit c9bb214ab9
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/shared_memory.cpp
View file

@ -460,10 +460,6 @@ namespace IPC {
return; return;
} }
if (master) { if (master) {
if (ftruncate(handle, 0) < 0) {
FAIL_MSG("truncate to zero for page %s failed: %s", name.c_str(), strerror(errno));
return;
}
if (ftruncate(handle, len) < 0) { if (ftruncate(handle, len) < 0) {
FAIL_MSG("truncate to %lld for page %s failed: %s", len, name.c_str(), strerror(errno)); FAIL_MSG("truncate to %lld for page %s failed: %s", len, name.c_str(), strerror(errno));
return; return;
@ -475,6 +471,10 @@ namespace IPC {
return; return;
} }
len = buffStats.st_size; len = buffStats.st_size;
if (!len){
mapped = 0;
return;
}
} }
mapped = (char *)mmap(0, len, PROT_READ | PROT_WRITE, MAP_SHARED, handle, 0); mapped = (char *)mmap(0, len, PROT_READ | PROT_WRITE, MAP_SHARED, handle, 0);
if (mapped == MAP_FAILED) { if (mapped == MAP_FAILED) {

1
src/output/output_rtmp.cpp
View file

@ -610,7 +610,6 @@ namespace Mist{
} }
if (amfData.getContentP(0)->StrValue() == "deleteStream"){ if (amfData.getContentP(0)->StrValue() == "deleteStream"){
stop(); stop();
onFinish();
return; return;
} }
if ((amfData.getContentP(0)->StrValue() == "FCUnpublish") || (amfData.getContentP(0)->StrValue() == "releaseStream")){ if ((amfData.getContentP(0)->StrValue() == "FCUnpublish") || (amfData.getContentP(0)->StrValue() == "releaseStream")){