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

upnpsoap: Handle StartingIndex on magic containers

Browse Source 
We need to subtract StartingIndex when we limit SQL query
results based on the max number of items in a magic container.
This commit is contained in:
Justin Maggard 2015-04-08 01:21:21 -07:00
parent f18c3cee6f
commit f09f441607
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
upnpsoap.c
View File

@ -1251,10 +1251,11 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
strncpyt(where, magic->where, sizeof(where)); strncpyt(where, magic->where, sizeof(where));
if (magic->max_count > 0) if (magic->max_count > 0)
{ {
int limit = MAX(magic->max_count - StartingIndex, 0);
ret = get_child_count(ObjectID, magic); ret = get_child_count(ObjectID, magic);
totalMatches = ret > magic->max_count ? magic->max_count : ret; totalMatches = MIN(ret, limit);
if (RequestedCount > magic->max_count || RequestedCount < 0) if (RequestedCount > limit || RequestedCount < 0)
RequestedCount = magic->max_count; RequestedCount = limit;
} }
} }
if (!where[0]) if (!where[0])