MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix .url files crashing forked-daapd and remove "support" for these.

Browse Source 
An .url file would lead to a crash due to codectype being null. This
is fixed with this commit, but at the same time support for these
files is completely removed, since even with the bug fixed .url
(and .pls) files would not stream.
This commit is contained in:
ejurgensen 2013-08-14 20:29:18 +02:00
parent cbdab26b53
commit 5f041b59eb
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -72,7 +72,7 @@ forked_daapd_SOURCES = main.c \
logger.c logger.h \ logger.c logger.h \
conffile.c conffile.h \ conffile.c conffile.h \
filescanner.c filescanner.h \ filescanner.c filescanner.h \
filescanner_ffmpeg.c filescanner_urlfile.c filescanner_m3u.c $(ITUNESSRC) \ filescanner_ffmpeg.c filescanner_m3u.c $(ITUNESSRC) \
mdns_avahi.c mdns.h \ mdns_avahi.c mdns.h \
remote_pairing.c remote_pairing.h \ remote_pairing.c remote_pairing.h \
evhttp/http.c evhttp/evhttp.h \ evhttp/http.c evhttp/evhttp.h \

8
src/filescanner.c
View File

@ -181,7 +181,7 @@ fixup_tags(struct media_file_info *mfi)
* Default to mpeg4 video/audio for unknown file types * Default to mpeg4 video/audio for unknown file types
* in an attempt to allow streaming of DRM-afflicted files * in an attempt to allow streaming of DRM-afflicted files
*/ */
if (strcmp(mfi->codectype, "unkn") == 0) if (mfi->codectype && strcmp(mfi->codectype, "unkn") == 0)
{ {
if (mfi->has_video) if (mfi->has_video)
{ {
@ -354,11 +354,9 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation)
if ((strcmp(ext, ".pls") == 0) if ((strcmp(ext, ".pls") == 0)
|| (strcmp(ext, ".url") == 0)) || (strcmp(ext, ".url") == 0))
{ {
mfi.data_kind = 1; /* url/stream */ DPRINTF(E_INFO, L_SCAN, "No support for .url and .pls in this version, use .m3u\n");
ret = scan_url_file(file, &mfi); goto out;
if (ret < 0)
goto out;
} }
else if ((strcmp(ext, ".png") == 0) else if ((strcmp(ext, ".png") == 0)
|| (strcmp(ext, ".jpg") == 0)) || (strcmp(ext, ".jpg") == 0))