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

* Free configuration memory from the scanner process before it quits.

Browse Source
This commit is contained in:
Justin Maggard 2010-06-03 21:58:32 +00:00
parent 6b1ae89af6
commit 047165a502
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
minidlna.c
View File

@ -692,6 +692,8 @@ main(int argc, char * * argv)
short int new_db = 0; short int new_db = 0;
pid_t scanner_pid = 0; pid_t scanner_pid = 0;
pthread_t inotify_thread = 0; pthread_t inotify_thread = 0;
struct media_dir_s *media_path, *last_path;
struct album_art_name_s *art_names, *last_name;
#ifdef TIVO_SUPPORT #ifdef TIVO_SUPPORT
unsigned short int beacon_interval = 5; unsigned short int beacon_interval = 5;
int sbeacon = -1; int sbeacon = -1;
@ -754,6 +756,23 @@ main(int argc, char * * argv)
{ {
start_scanner(); start_scanner();
sqlite3_close(db); sqlite3_close(db);
media_path = media_dirs;
art_names = album_art_names;
while( media_path )
{
free(media_path->path);
last_path = media_path;
media_path = media_path->next;
free(last_path);
}
while( art_names )
{
free(art_names->name);
last_name = art_names;
art_names = art_names->next;
free(last_name);
}
freeoptions();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
#else #else
@ -1037,8 +1056,8 @@ shutdown:
sql_exec(db, "UPDATE SETTINGS set UPDATE_ID = %u", updateID); sql_exec(db, "UPDATE SETTINGS set UPDATE_ID = %u", updateID);
sqlite3_close(db); sqlite3_close(db);
struct media_dir_s * media_path = media_dirs; media_path = media_dirs;
struct media_dir_s * last_path; art_names = album_art_names;
while( media_path ) while( media_path )
{ {
free(media_path->path); free(media_path->path);
@ -1046,8 +1065,6 @@ shutdown:
media_path = media_path->next; media_path = media_path->next;
free(last_path); free(last_path);
} }
struct album_art_name_s * art_names = album_art_names;
struct album_art_name_s * last_name;
while( art_names ) while( art_names )
{ {
free(art_names->name); free(art_names->name);