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

* Properly escape TiVo folder names in one more place.

Browse Source
This commit is contained in:
Justin Maggard 2010-10-05 08:13:54 +00:00
parent 9985630b73
commit 6ec5255d60
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tivo_commands.c
View File

@ -349,10 +349,11 @@ SendContainer(struct upnphttp * h, const char * objectID, int itemStart, int ite
char *sql, *item, *saveptr; char *sql, *item, *saveptr;
char *zErrMsg = NULL; char *zErrMsg = NULL;
char **result; char **result;
char *title; char *title = NULL;
char what[10], order[64]={0}, order2[64]={0}, myfilter[256]={0}; char what[10], order[64]={0}, order2[64]={0}, myfilter[256]={0};
char str_buf[1024]; char str_buf[1024];
char *which; char *which;
char type[8];
char groupBy[19] = {0}; char groupBy[19] = {0};
struct Response args; struct Response args;
int totalMatches = 0; int totalMatches = 0;
@ -373,6 +374,22 @@ SendContainer(struct upnphttp * h, const char * objectID, int itemStart, int ite
args.requested = itemCount * -1; args.requested = itemCount * -1;
} }
switch( *objectID )
{
case '1':
strcpy(type, "music");
break;
case '2':
strcpy(type, "videos");
break;
case '3':
strcpy(type, "photos");
break;
default:
strcpy(type, "server");
break;
}
if( strlen(objectID) == 1 ) if( strlen(objectID) == 1 )
{ {
switch( *objectID ) switch( *objectID )
@ -395,7 +412,11 @@ SendContainer(struct upnphttp * h, const char * objectID, int itemStart, int ite
{ {
sql = sqlite3_mprintf("SELECT NAME from OBJECTS where OBJECT_ID = '%s'", objectID); sql = sqlite3_mprintf("SELECT NAME from OBJECTS where OBJECT_ID = '%s'", objectID);
if( (sql_get_table(db, sql, &result, &ret, NULL) == SQLITE_OK) && ret ) if( (sql_get_table(db, sql, &result, &ret, NULL) == SQLITE_OK) && ret )
title = strdup(result[1]); {
title = escape_tag(result[1]);
if( !title )
title = strdup(result[1]);
}
else else
title = strdup("UNKNOWN"); title = strdup("UNKNOWN");
sqlite3_free(sql); sqlite3_free(sql);
@ -619,8 +640,7 @@ SendContainer(struct upnphttp * h, const char * objectID, int itemStart, int ite
"</Details>" "</Details>"
"<ItemStart>%d</ItemStart>" "<ItemStart>%d</ItemStart>"
"<ItemCount>%d</ItemCount>", "<ItemCount>%d</ItemCount>",
(objectID[0]=='1' ? "music":"photos"), type, totalMatches, title, args.start, args.returned);
totalMatches, title, args.start, args.returned);
args.resp = resp+1024-ret; args.resp = resp+1024-ret;
memcpy(args.resp, &str_buf, ret); memcpy(args.resp, &str_buf, ret);
ret = sprintf(str_buf, "</TiVoContainer>"); ret = sprintf(str_buf, "</TiVoContainer>");