MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-13 07:53:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix ton of memory leaks

Browse Source
This commit is contained in:
Ron Pedde 2005-05-18 05:48:22 +00:00
parent e80fc585c9
commit 75d5f1b289
3 changed files with 45 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db-generic.c
View File

@ -897,7 +897,7 @@ int db_utf8_validate_string(char *string) {
if(!string)
return 0;
while(*current) {
while(*current) {
if(!((*current) & 0x80)) {
current++;
} else {

39
src/dbs-sqlite.c
View File

@ -105,21 +105,18 @@ int db_sqlite_exec(int loglevel, char *fmt, ...) {
db_sqlite_lock();
err=sqlite_exec(db_sqlite_songs,query,NULL,NULL,&perr);
if(err == SQLITE_OK)
sqlite_freemem(query);
db_sqlite_unlock();
if(err != SQLITE_OK) {
DPRINTF(loglevel == E_FATAL ? E_LOG : loglevel,L_DB,"Query: %s\n",query);
DPRINTF(loglevel == E_FATAL ? E_LOG : loglevel,L_DB,"Query: %s\n",
query);
DPRINTF(loglevel,L_DB,"Error: %s\n",perr);
db_sqlite_lock();
sqlite_freemem(query);
db_sqlite_unlock();
return err;
sqlite_freemem(perr);
} else {
DPRINTF(E_DBG,L_DB,"Rows: %d\n",sqlite_changes(db_sqlite_songs));
}
sqlite_freemem(query);
DPRINTF(E_DBG,L_DB,"Affected rows: %d\n",sqlite_changes(db_sqlite_songs));
return 0;
db_sqlite_unlock();
return err;
}
/**
@ -149,6 +146,7 @@ int db_sqlite_get_table(int loglevel, char ***resarray, int *rows, int *cols, ch
DPRINTF(loglevel,L_DB,"Error: %s\n",perr);
db_sqlite_lock();
sqlite_freemem(query);
sqlite_freemem(perr);
db_sqlite_unlock();
return err;
}
@ -191,6 +189,7 @@ int db_sqlite_get_int(int loglevel, int *result, char *fmt, ...) {
DPRINTF(loglevel,L_DB,"Error: %s\n",perr);
db_sqlite_lock();
sqlite_freemem(query);
sqlite_freemem(perr);
db_sqlite_unlock();
return DB_E_SQL_ERROR;
}
@ -217,8 +216,10 @@ int db_sqlite_open(char *parameters) {
db_sqlite_lock();
db_sqlite_songs=sqlite_open(db_path,0666,&perr);
if(!db_sqlite_songs)
if(!db_sqlite_songs) {
DPRINTF(E_FATAL,L_DB,"db_sqlite_open: %s (%s)\n",perr,db_path);
sqlite_freemem(perr);
}
sqlite_busy_timeout(db_sqlite_songs,30000); /* 30 seconds */
@ -758,6 +759,7 @@ int db_sqlite_enum_start(DBQUERYINFO *pinfo) {
err=sqlite_get_table(db_sqlite_songs,scratch,&resarray,&rows,&cols,&perr);
if(err != SQLITE_OK) {
DPRINTF(E_LOG,L_DB|L_DAAP,"Error: %s\n",perr);
sqlite_freemem(perr);
db_sqlite_unlock();
return -1;
}
@ -834,6 +836,7 @@ int db_sqlite_enum_start(DBQUERYINFO *pinfo) {
if(err != SQLITE_OK) {
db_sqlite_unlock();
DPRINTF(E_LOG,L_DB,"Error in results query: %s\n",perr);
sqlite_freemem(perr);
return -1;
}
@ -884,6 +887,7 @@ int db_sqlite_enum_start(DBQUERYINFO *pinfo) {
if(err != SQLITE_OK) {
DPRINTF(E_LOG,L_DB,"Could not compile query: %s\n",query);
sqlite_freemem(perr);
return -1;
}
@ -913,8 +917,9 @@ int db_sqlite_enum_size(DBQUERYINFO *pinfo, int *count) {
if(err != SQLITE_DONE) {
sqlite_finalize(db_sqlite_pvm,&perr);
db_sqlite_unlock();
DPRINTF(E_FATAL,L_DB,"sqlite_step: %s\n",perr);
sqlite_freemem(perr);
db_sqlite_unlock();
}
db_sqlite_unlock();
@ -959,9 +964,10 @@ int db_sqlite_enum_fetch(DBQUERYINFO *pinfo, unsigned char **pdmap) {
db_sqlite_lock();
sqlite_finalize(db_sqlite_pvm,&perr);
DPRINTF(E_FATAL,L_DB,"sqlite_step: %s\n",perr);
sqlite_freemem(perr);
db_sqlite_unlock();
DPRINTF(E_FATAL,L_DB,"sqlite_step: %s\n",perr);
return 0;
}
@ -978,10 +984,13 @@ int db_sqlite_enum_reset(DBQUERYINFO *pinfo) {
* stop the enum
*/
int db_sqlite_enum_end(void) {
char *perr;
char *perr=NULL;
db_sqlite_lock();
sqlite_finalize(db_sqlite_pvm,&perr);
if(perr) {
sqlite_freemem(perr);
}
db_sqlite_unlock();
return 0;

59
src/scan-xml.c
View File

@ -47,8 +47,10 @@ static char *scan_xml_itunes_base_path = NULL;
static char *scan_xml_itunes_decoded_base_path = NULL;
static char *scan_xml_real_base_path = NULL;
#define MAYBECOPY(a) if(!mp3.a) mp3.a = pmp3->a
#define MAYBEFREE(a) if((a)) free((a))
#define MAYBECOPY(a) if(mp3.a) pmp3->a = mp3.a
#define MAYBECOPYSTRING(a) if(mp3.a) { free(pmp3->a); pmp3->a = mp3.a; }
#define MAYBEFREE(a) if((a)) { free((a)); (a)=NULL; }
static char *scan_xml_track_tags[] = {
"Name",
@ -418,52 +420,31 @@ int scan_xml_tracks_section(int action, char *info) {
realpath(physical_path,real_path);
pmp3=db_fetch_path(real_path);
if(pmp3) {
MAYBECOPY(title);
MAYBECOPY(artist);
MAYBECOPY(album);
MAYBECOPY(genre);
MAYBECOPY(comment);
MAYBECOPY(type);
MAYBECOPY(composer);
MAYBECOPY(orchestra);
MAYBECOPY(conductor);
MAYBECOPY(grouping);
MAYBECOPY(url);
MAYBECOPY(bitrate);
MAYBECOPY(samplerate);
/* Update the existing record with the
* updated stuff we got from the iTunes xml file
*/
MAYBECOPYSTRING(title);
MAYBECOPYSTRING(artist);
MAYBECOPYSTRING(album);
MAYBECOPYSTRING(genre);
MAYBECOPY(song_length);
MAYBECOPY(file_size);
MAYBECOPY(year);
MAYBECOPY(track);
MAYBECOPY(total_tracks);
MAYBECOPY(disc);
MAYBECOPY(total_discs);
MAYBECOPY(time_added);
MAYBECOPY(time_modified);
MAYBECOPY(time_played);
MAYBECOPY(year);
MAYBECOPY(bitrate);
MAYBECOPY(samplerate);
MAYBECOPY(play_count);
MAYBECOPY(rating);
MAYBECOPY(db_timestamp);
MAYBECOPY(disabled);
MAYBECOPY(bpm);
MAYBECOPY(id);
MAYBECOPY(description);
MAYBECOPY(codectype);
MAYBECOPY(item_kind);
MAYBECOPY(data_kind);
MAYBECOPY(force_update);
MAYBECOPY(sample_count);
MAYBECOPY(compilation);
MAYBECOPY(disc);
MAYBECOPY(total_discs);
db_add(&mp3);
db_add(pmp3);
db_dispose_item(pmp3);
memset((void*)&mp3,0,sizeof(MP3FILE));
MAYBEFREE(song_path);
}
}
MAYBEFREE(mp3.title);
MAYBEFREE(mp3.artist);
MAYBEFREE(mp3.album);
MAYBEFREE(mp3.genre);
MAYBEFREE(song_path);
} else {
return XML_STATE_ERROR;
}