MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

segv when error not set, thanks to kit from forums

This commit is contained in:
Ron Pedde 2006-06-07 03:24:39 +00:00
parent b36c4a12d6
commit 53125647d6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/smart-parser.c
View File

@ -359,6 +359,8 @@ typedef struct tag_parsetree {
#define SP_E_TIMEINTERVAL 0x0b #define SP_E_TIMEINTERVAL 0x0b
#define SP_E_DATE 0x0c #define SP_E_DATE 0x0c
#define SP_E_EXPRQUOTE 0x0d #define SP_E_EXPRQUOTE 0x0d
#define SP_E_EOS 0x0e
#define SP_E_UNKNOWN 0x0f
char *sp_errorstrings[] = { char *sp_errorstrings[] = {
"Success", "Success",
@ -374,7 +376,9 @@ char *sp_errorstrings[] = {
"Expecting interval comparison (before, after)", "Expecting interval comparison (before, after)",
"Expecting time interval (days, weeks, months, years)", "Expecting time interval (days, weeks, months, years)",
"Expecting date", "Expecting date",
"Expecting ' (single quote)\n" "Expecting ' (single quote)\n",
"Expecting end of statement\n",
"Unknown Error. Help?\n"
}; };
/* Forwards */ /* Forwards */
@ -745,6 +749,7 @@ SP_NODE *sp_parse_phrase(PARSETREE tree) {
expr = sp_parse_oexpr(tree); expr = sp_parse_oexpr(tree);
if((!expr) || (tree->token.token_id != T_EOF)) { if((!expr) || (tree->token.token_id != T_EOF)) {
sp_set_error(tree,SP_E_EOS);
sp_free_node(expr); sp_free_node(expr);
expr = NULL; expr = NULL;
} }
@ -1478,6 +1483,9 @@ char *sp_sql_clause(PARSETREE tree) {
* @returns text of the last error * @returns text of the last error
*/ */
char *sp_get_error(PARSETREE tree) { char *sp_get_error(PARSETREE tree) {
if(tree->error == NULL) {
sp_set_error(tree,SP_E_UNKNOWN);
}
return tree->error; return tree->error;
} }