Fix for crash on empty extension, as reported by Denis in forums

This commit is contained in:
Ron Pedde 2006-08-02 23:37:08 +00:00
parent 287c35d25d
commit 9ca4ac55ba
1 changed files with 3 additions and 3 deletions

View File

@ -572,9 +572,9 @@ void scan_filename(char *path, int compdir, char *extensions) {
DPRINTF(E_WARN,L_SCAN,"Error statting: %s\n",strerror(errno)); DPRINTF(E_WARN,L_SCAN,"Error statting: %s\n",strerror(errno));
} else { } else {
/* we assume this is regular file */ /* we assume this is regular file */
if(strlen(fname) > 4) { if(strlen(fname) > 2) {
ext = strrchr(fname, '.'); ext = strrchr(fname, '.');
if(ext) { if(ext && ((int)strlen(ext) > 1)) {
if(strcasecmp(".m3u",ext) == 0) { if(strcasecmp(".m3u",ext) == 0) {
scan_add_playlistlist(mp3_path); scan_add_playlistlist(mp3_path);
} else if(strcasecmp(".xml",ext) == 0) { } else if(strcasecmp(".xml",ext) == 0) {
@ -622,7 +622,7 @@ void scan_music_file(char *path, char *fname,
if((fname) && (strlen(fname) > 1) && (fname[strlen(fname)-1] != '.')) { if((fname) && (strlen(fname) > 1) && (fname[strlen(fname)-1] != '.')) {
type = strrchr(fname, '.') + 1; type = strrchr(fname, '.') + 1;
if(type) { if(type && *type) {
/* see if there is "official" format and info for it */ /* see if there is "official" format and info for it */
ptaghandler=scan_gethandler(type); ptaghandler=scan_gethandler(type);
if(ptaghandler) { if(ptaghandler) {