oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

stored_playlist: unsigned index arguments

Browse Source 
Pass index arguments as unsigned integers.  They must not be negative,
and even if some caller accidently passes -1, it won't pass the bound
checks (since it's now 2**32-1).
This commit is contained in:
Max Kellermann
2008-10-23 09:53:34 +02:00
parent bc938603f6
commit 3958457256
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/stored_playlist.c
View File

@@ -280,7 +280,7 @@ spl_move_index_internal(List *list, int src, int dest)
} }
enum playlist_result enum playlist_result
spl_move_index(const char *utf8path, int src, int dest) spl_move_index(const char *utf8path, unsigned src, unsigned dest)
{ {
List *list; List *list;
enum playlist_result result; enum playlist_result result;
@@ -323,7 +323,7 @@ spl_clear(const char *utf8path)
} }
static int static int
spl_remove_index_internal(List *list, int pos) spl_remove_index_internal(List *list, unsigned pos)
{ {
ListNode *node = spl_get_index(list, pos); ListNode *node = spl_get_index(list, pos);
if (!node) if (!node)
@@ -335,7 +335,7 @@ spl_remove_index_internal(List *list, int pos)
} }
enum playlist_result enum playlist_result
spl_remove_index(const char *utf8path, int pos) spl_remove_index(const char *utf8path, unsigned pos)
{ {
List *list; List *list;
enum playlist_result result; enum playlist_result result;
@@ -409,7 +409,7 @@ spl_append_uri(const char *url, const char *utf8file)
song = song_remote_new(url); song = song_remote_new(url);
if (song) { if (song) {
int ret = spl_append_song(utf8file, song); enum playlist_result ret = spl_append_song(utf8file, song);
song_free(song); song_free(song);
return ret; return ret;
} }

4
src/stored_playlist.h
View File

@@ -46,13 +46,13 @@ List *
spl_load(const char *utf8path); spl_load(const char *utf8path);
enum playlist_result enum playlist_result
spl_move_index(const char *utf8path, int src, int dest); spl_move_index(const char *utf8path, unsigned src, unsigned dest);
enum playlist_result enum playlist_result
spl_clear(const char *utf8path); spl_clear(const char *utf8path);
enum playlist_result enum playlist_result
spl_remove_index(const char *utf8path, int pos); spl_remove_index(const char *utf8path, unsigned pos);
enum playlist_result enum playlist_result
spl_append_song(const char *utf8path, struct song *song); spl_append_song(const char *utf8path, struct song *song);