ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve parser error checking.

This commit is contained in:
Mike McCormack 2005-05-23 16:23:11 +00:00 committed by Alexandre Julliard
parent 3655187fd0
commit b18c262d57
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
dlls/msi/sql.y
View File

@ -155,21 +155,26 @@ onequery:
oneinsert: oneinsert:
TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP
{ {
SQL_input *sql = (SQL_input*) info; SQL_input *sql = (SQL_input*) info;
MSIVIEW *insert = NULL; MSIVIEW *insert = NULL;
UINT r;
INSERT_CreateView( sql->db, &insert, $3, $5, $9, FALSE ); r = INSERT_CreateView( sql->db, &insert, $3, $5, $9, FALSE );
$$ = insert; if( !insert )
} YYABORT;
$$ = insert;
}
| TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_TEMP | TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_TEMP
{ {
SQL_input *sql = (SQL_input*) info; SQL_input *sql = (SQL_input*) info;
MSIVIEW *insert = NULL; MSIVIEW *insert = NULL;
INSERT_CreateView( sql->db, &insert, $3, $5, $9, TRUE ); INSERT_CreateView( sql->db, &insert, $3, $5, $9, TRUE );
$$ = insert; if( !insert )
} YYABORT;
$$ = insert;
}
; ;
onecreate: onecreate:
@ -181,6 +186,8 @@ onecreate:
if( !$5 ) if( !$5 )
YYABORT; YYABORT;
CREATE_CreateView( sql->db, &create, $3, $5, FALSE ); CREATE_CreateView( sql->db, &create, $3, $5, FALSE );
if( !create )
YYABORT;
$$ = create; $$ = create;
} }
| TK_CREATE TK_TABLE table TK_LP table_def TK_RP TK_HOLD | TK_CREATE TK_TABLE table TK_LP table_def TK_RP TK_HOLD
@ -191,6 +198,8 @@ onecreate:
if( !$5 ) if( !$5 )
YYABORT; YYABORT;
CREATE_CreateView( sql->db, &create, $3, $5, TRUE ); CREATE_CreateView( sql->db, &create, $3, $5, TRUE );
if( !create )
YYABORT;
$$ = create; $$ = create;
} }
; ;
@ -202,6 +211,8 @@ oneupdate:
MSIVIEW *update = NULL; MSIVIEW *update = NULL;
UPDATE_CreateView( sql->db, &update, $2, &$4, $6 ); UPDATE_CreateView( sql->db, &update, $2, &$4, $6 );
if( !update )
YYABORT;
$$ = update; $$ = update;
} }
; ;
@ -213,6 +224,8 @@ onedelete:
MSIVIEW *delete = NULL; MSIVIEW *delete = NULL;
DELETE_CreateView( sql->db, &delete, $2 ); DELETE_CreateView( sql->db, &delete, $2 );
if( !delete )
YYABORT;
$$ = delete; $$ = delete;
} }
; ;
@ -569,18 +582,26 @@ const_val:
TK_INTEGER TK_INTEGER
{ {
$$ = EXPR_ival( info, &$1, 1 ); $$ = EXPR_ival( info, &$1, 1 );
if( !$$ )
YYABORT;
} }
| TK_MINUS TK_INTEGER | TK_MINUS TK_INTEGER
{ {
$$ = EXPR_ival( info, &$2, -1 ); $$ = EXPR_ival( info, &$2, -1 );
if( !$$ )
YYABORT;
} }
| TK_STRING | TK_STRING
{ {
$$ = EXPR_sval( info, &$1 ); $$ = EXPR_sval( info, &$1 );
if( !$$ )
YYABORT;
} }
| TK_WILDCARD | TK_WILDCARD
{ {
$$ = EXPR_wildcard( info ); $$ = EXPR_wildcard( info );
if( !$$ )
YYABORT;
} }
; ;
@ -588,6 +609,8 @@ column_val:
column column
{ {
$$ = EXPR_column( info, $1 ); $$ = EXPR_column( info, $1 );
if( !$$ )
YYABORT;
} }
; ;