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

use size_t

Browse Source 
When dealing with in-memory lengths, the standard type "size_t" should
be used.  Missing one can be quite dangerous, because an attacker
could provoke an integer under-/overflow, which may provide an attack
vector.

git-svn-id: https://svn.musicpd.org/mpd/trunk@7205 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann
2008-03-26 10:38:07 +00:00
committed by Eric Wong
parent 0692f6cd0a
commit 27f12c173d
9 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ls.c
+5 -5
View File
@@ -112,10 +112,10 @@ int lsPlaylists(int fd, const char *utf8path)
char *actualPath = rpp2app_r(path_max_tmp,
utf8_to_fs_charset(path_max_tmp,
utf8path));
int actlen = strlen(actualPath) + 1;
int maxlen = MPD_PATH_MAX - actlen;
int suflen = strlen(PLAYLIST_FILE_SUFFIX) + 1;
int suff;
size_t actlen = strlen(actualPath) + 1;
size_t maxlen = MPD_PATH_MAX - actlen;
size_t suflen = strlen(PLAYLIST_FILE_SUFFIX) + 1;
ssize_t suff;
if (actlen > MPD_PATH_MAX - 1 || (dir = opendir(actualPath)) == NULL) {
return 0;
@@ -131,7 +131,7 @@ int lsPlaylists(int fd, const char *utf8path)
duplicated = ent->d_name;
if (mpd_likely(len <= maxlen) &&
duplicated[0] != '.' &&
(suff = strlen(duplicated) - suflen) > 0 &&
(suff = (ssize_t)(strlen(duplicated) - suflen)) > 0 &&
duplicated[suff] == '.' &&
strcmp(duplicated + suff + 1, PLAYLIST_FILE_SUFFIX) == 0) {
memcpy(s + actlen, ent->d_name, len);