storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix some issues reported by cppcheck.

Browse Source
This commit is contained in:
Justin Maggard
2011-05-02 23:50:52 +00:00
parent e0e0fa254d
commit 9a9270cecf
18 changed files with 298 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
upnpdescgen.c
View File

@ -527,6 +527,7 @@ static const struct serviceDesc scpdX_MS_MediaReceiverRegistrar =
static char *
strcat_str(char * str, int * len, int * tmplen, const char * s2)
{
char *p;
int s2len;
s2len = (int)strlen(s2);
if(*tmplen <= (*len + s2len))
@ -535,7 +536,17 @@ strcat_str(char * str, int * len, int * tmplen, const char * s2)
*tmplen += 256;
else
*tmplen += s2len + 1;
str = (char *)realloc(str, *tmplen);
p = realloc(str, *tmplen);
if (!p)
{
if(s2len < 256)
*tmplen -= 256;
else
*tmplen -= s2len + 1;
return str;
}
else
str = p;
}
/*strcpy(str + *len, s2); */
memcpy(str + *len, s2, s2len + 1);
@ -549,10 +560,18 @@ strcat_str(char * str, int * len, int * tmplen, const char * s2)
static char *
strcat_char(char * str, int * len, int * tmplen, char c)
{
char *p;
if(*tmplen <= (*len + 1))
{
*tmplen += 256;
str = (char *)realloc(str, *tmplen);
p = (char *)realloc(str, *tmplen);
if (!p)
{
*tmplen -= 256;
return str;
}
else
str = p;
}
str[*len] = c;
(*len)++;