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

-fixes strncpy & buf size

Browse Source
This commit is contained in:
satbaby
2012-08-07 18:51:44 +02:00
parent af74eb4f7e
commit 7359504dd7
15 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/netfile.cpp
View File

@@ -1059,6 +1059,7 @@ FILE *f_open(const char *filename, const char *acctype)
for(int i=0; ((ptr != NULL) && (i<25)); ptr = strstr(ptr, "http://") )
{
strncpy(servers[i], ptr, 1023);
servers[i][1023] = '\0';
ptr2 = strchr(servers[i], '\n');
if(ptr2) *ptr2 = 0;
// change ptr so that next strstr searches in buf and not in servers[i]
@@ -1300,6 +1301,7 @@ const char *f_type(FILE *stream, const char *type)
{
stream_type[i].stream = stream;
strncpy(stream_type[i].type, type, 64);
stream_type[i].type[64] = '\0';
dprintf(stderr, "added entry (%s) for %p\n", type, stream);
}
return type;
@@ -1720,7 +1722,8 @@ void ShoutCAST_ParseMetaData(char *md, CSTATE *state)
if(!ptr)
{
ptr = strchr(md, '=');
strncpy(state->title, ptr + 2, 4096);
strncpy(state->title, ptr + 2, 4095);
state->title[4095] = '\0';
ptr = strchr(state->title, ';');
if(ptr)
*(ptr - 1) = 0;
@@ -1736,7 +1739,8 @@ void ShoutCAST_ParseMetaData(char *md, CSTATE *state)
ptr = strstr(md, "StreamTitle=");
ptr = strchr(ptr, '\'');
strncpy(state->artist, ptr + 1, 4096);
strncpy(state->artist, ptr + 1, 4095);
state->artist[4095] = '\0';
ptr = strstr(state->artist, " - ");
if(!ptr)
ptr = strstr(state->artist, ", ");