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 memory leak when parsing smart playlists

Browse Source
This commit is contained in:
chme 2015-09-19 09:41:48 +02:00 committed by ejurgensen
parent 1ed240d92c
commit 0245813d34
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/filescanner_smartpl.c
View File

@ -51,6 +51,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
pANTLR3_COMMON_TREE_NODE_STREAM nodes; pANTLR3_COMMON_TREE_NODE_STREAM nodes;
pSMARTPL2SQL sqlconv; pSMARTPL2SQL sqlconv;
SMARTPL2SQL_playlist_return plreturn; SMARTPL2SQL_playlist_return plreturn;
int ret;
#if ANTLR3C_NEW_INPUT #if ANTLR3C_NEW_INPUT
input = antlr3FileStreamNew((pANTLR3_UINT8) file, ANTLR3_ENC_8BIT); input = antlr3FileStreamNew((pANTLR3_UINT8) file, ANTLR3_ENC_8BIT);
@ -72,6 +73,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
if (lxr == NULL) if (lxr == NULL)
{ {
DPRINTF(E_LOG, L_SCAN, "Could not create SMARTPL lexer\n"); DPRINTF(E_LOG, L_SCAN, "Could not create SMARTPL lexer\n");
ret = -1;
goto lxr_fail; goto lxr_fail;
} }
@ -80,6 +82,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
if (tstream == NULL) if (tstream == NULL)
{ {
DPRINTF(E_LOG, L_SCAN, "Could not create SMARTPL token stream\n"); DPRINTF(E_LOG, L_SCAN, "Could not create SMARTPL token stream\n");
ret = -1;
goto tkstream_fail; goto tkstream_fail;
} }
@ -89,6 +92,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
if (tstream == NULL) if (tstream == NULL)
{ {
DPRINTF(E_LOG, L_SCAN, "Could not create SMARTPL parser\n"); DPRINTF(E_LOG, L_SCAN, "Could not create SMARTPL parser\n");
ret = -1;
goto psr_fail; goto psr_fail;
} }
@ -98,6 +102,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
if (psr->pParser->rec->state->errorCount > 0) if (psr->pParser->rec->state->errorCount > 0)
{ {
DPRINTF(E_LOG, L_SCAN, "SMARTPL query parser terminated with %d errors\n", psr->pParser->rec->state->errorCount); DPRINTF(E_LOG, L_SCAN, "SMARTPL query parser terminated with %d errors\n", psr->pParser->rec->state->errorCount);
ret = -1;
goto psr_error; goto psr_error;
} }
@ -107,6 +112,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
if (!nodes) if (!nodes)
{ {
DPRINTF(E_LOG, L_SCAN, "Could not create node stream\n"); DPRINTF(E_LOG, L_SCAN, "Could not create node stream\n");
ret = -1;
goto psr_error; goto psr_error;
} }
@ -114,6 +120,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
if (!sqlconv) if (!sqlconv)
{ {
DPRINTF(E_LOG, L_SCAN, "Could not create SQL converter\n"); DPRINTF(E_LOG, L_SCAN, "Could not create SQL converter\n");
ret = -1;
goto sql_fail; goto sql_fail;
} }
@ -123,6 +130,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
if (sqlconv->pTreeParser->rec->state->errorCount > 0) if (sqlconv->pTreeParser->rec->state->errorCount > 0)
{ {
DPRINTF(E_LOG, L_SCAN, "SMARTPL query tree parser terminated with %d errors\n", sqlconv->pTreeParser->rec->state->errorCount); DPRINTF(E_LOG, L_SCAN, "SMARTPL query tree parser terminated with %d errors\n", sqlconv->pTreeParser->rec->state->errorCount);
ret = -1;
goto sql_error; goto sql_error;
} }
@ -138,10 +146,13 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
free(pli->query); free(pli->query);
pli->query = strdup((char *)plreturn.query->chars); pli->query = strdup((char *)plreturn.query->chars);
return 0; ret = 0;
} }
else else
DPRINTF(E_LOG, L_SCAN, "Invalid SMARTPL query\n"); {
DPRINTF(E_LOG, L_SCAN, "Invalid SMARTPL query\n");
ret = -1;
}
sql_error: sql_error:
sqlconv->free(sqlconv); sqlconv->free(sqlconv);
@ -156,7 +167,7 @@ smartpl_parse_file(const char *file, struct playlist_info *pli)
lxr_fail: lxr_fail:
input->close(input); input->close(input);
return -1; return ret;
} }
void void