generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix segfault on UDP reading

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Andrey Utkin 2011-11-03 07:00:15 +00:00 committed by Michael Niedermayer
parent 4354788a89
commit 7a032cb97f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/udp.c
View File

@ -546,15 +546,19 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
avail = av_fifo_size(s->fifo);
if (avail) { // >=size) {
uint8_t tmp[4];
int skip = 0;
av_fifo_generic_read(s->fifo, tmp, 4, NULL);
avail= AV_RL32(tmp);
if(avail > size){
av_log(h, AV_LOG_WARNING, "Part of datagram lost due to insufficient buffer size\n");
skip = avail - size;
avail= size;
}
av_fifo_generic_read(s->fifo, buf, avail, NULL);
if (skip)
av_fifo_drain(s->fifo, skip);
return avail;
}
else {