mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/driver/netfile.cpp fix possible segfaults

Browse Source
This commit is contained in:
Jacek Jendrzej
2016-03-09 21:45:38 +01:00
parent 9e3b1c5844
commit e625836bc2
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/driver/netfile.cpp
View File

@@ -1801,6 +1801,10 @@ void ShoutCAST_MetaFilter(STREAM_FILTER *arg)
FILTERDATA *filterdata = (FILTERDATA*)arg->user; FILTERDATA *filterdata = (FILTERDATA*)arg->user;
int meta_int = filterdata->meta_int; int meta_int = filterdata->meta_int;
int len = *arg->len; int len = *arg->len;
if(len < 0){
dprintf(stderr, "[%s] : error ---> len %i < 0\n",__func__, len);
return;
}
char*buf = (char*)arg->buf; char*buf = (char*)arg->buf;
int meta_start; int meta_start;
@@ -1815,6 +1819,12 @@ void ShoutCAST_MetaFilter(STREAM_FILTER *arg)
if(filterdata->stored < filterdata->len) if(filterdata->stored < filterdata->len)
{ {
int bsize = (filterdata->len + 1) - filterdata->stored; int bsize = (filterdata->len + 1) - filterdata->stored;
printf("filterdata->len %i bsize %i len %i\n",filterdata->len,bsize,len);
/*check overload size*/
if(bsize > len){
dprintf(stderr, "[%s] : error ---> bsize %i > len %i\n",__func__,bsize, len);
return;
}
/* if there is some meta data, extract it */ /* if there is some meta data, extract it */
/* there can be zero size blocks too */ /* there can be zero size blocks too */
@@ -1883,7 +1893,12 @@ void ShoutCAST_MetaFilter(STREAM_FILTER *arg)
//dprintf(stderr, "filter : metadata : \n\n\n----------\n%s\n----------\n\n\n", filterdata->meta_data); //dprintf(stderr, "filter : metadata : \n\n\n----------\n%s\n----------\n\n\n", filterdata->meta_data);
} }
/*check negative size*/
if(len - b < 0)
{
dprintf(stderr, "[%s] : error ---> len - b %i\n",__func__,len-b);
return;
}
/* remove the metadata and it's size indicator from the buffer */ /* remove the metadata and it's size indicator from the buffer */
memmove(buf + meta_start, buf + b, len - b ); memmove(buf + meta_start, buf + b, len - b );