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

Buffer crash fix

Browse source
This commit is contained in:
Thulinma 2010-11-08 03:12:24 +01:00
parent c4e1851f42
commit 981304acaf
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Buffer/main.cpp
View file

@ -60,7 +60,7 @@ int main( int argc, char * argv[] ) {
int infile = fileno(stdin); int infile = fileno(stdin);
int poller = epoll_create(1); int poller = epoll_create(1);
struct epoll_event ev; struct epoll_event ev;
ev.events = EPOLLIN | EPOLLPRI | EPOLLERR | EPOLLHUP; ev.events = EPOLLIN;
ev.data.fd = infile; ev.data.fd = infile;
epoll_ctl(poller, EPOLL_CTL_ADD, infile, &ev); epoll_ctl(poller, EPOLL_CTL_ADD, infile, &ev);
struct epoll_event events[1]; struct epoll_event events[1];

6
util/flv.cpp
View file

@ -1,4 +1,5 @@
#include <unistd.h> //for read() #include <unistd.h> //for read()
#include <fcntl.h>
struct FLV_Pack { struct FLV_Pack {
int len; int len;
@ -47,6 +48,9 @@ bool ReadUntil(char * buffer, unsigned int count, unsigned int & sofar){
//resizes FLV_Pack data field bigger if data doesn't fit //resizes FLV_Pack data field bigger if data doesn't fit
// (does not auto-shrink for speed!) // (does not auto-shrink for speed!)
bool FLV_GetPacket(FLV_Pack *& p){ bool FLV_GetPacket(FLV_Pack *& p){
int preflags = fcntl(fileno(stdin), F_GETFL, 0);
int postflags = preflags | O_NONBLOCK;
fcntl(fileno(stdin), F_SETFL, postflags);
static bool done = true; static bool done = true;
static unsigned int sofar = 0; static unsigned int sofar = 0;
if (!p){p = (FLV_Pack*)calloc(1, sizeof(FLV_Pack));} if (!p){p = (FLV_Pack*)calloc(1, sizeof(FLV_Pack));}
@ -80,9 +84,11 @@ bool FLV_GetPacket(FLV_Pack *& p){
if ((p->data[0] == 0x09) && (((p->data[11] & 0xf0) >> 4) == 1)){p->isKeyframe = true;} if ((p->data[0] == 0x09) && (((p->data[11] & 0xf0) >> 4) == 1)){p->isKeyframe = true;}
done = true; done = true;
sofar = 0; sofar = 0;
fcntl(fileno(stdin), F_SETFL, preflags);
return true; return true;
} }
} }
fcntl(fileno(stdin), F_SETFL, preflags);
return false; return false;
}//FLV_GetPacket }//FLV_GetPacket