Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7ea38f0

Browse files
author
Michael Meskes
committed
Change error handling of out of scope variables in ecpg.
The function called can result in an out of memory error that subsequently wasdisregarded. Instead it should set the appropriate SQL error variables and bechecked by whatever whenever statement is defined.
1 parente2f731c commit7ea38f0

File tree

10 files changed

+75
-21
lines changed

10 files changed

+75
-21
lines changed

‎src/interfaces/ecpg/ecpglib/misc.c‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,17 @@ ECPGset_var(int number, void *pointer, int lineno)
525525
{
526526
structvar_list*ptr;
527527

528+
structsqlca_t*sqlca=ECPGget_sqlca();
529+
530+
if (sqlca==NULL)
531+
{
532+
ecpg_raise(lineno,ECPG_OUT_OF_MEMORY,
533+
ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY,NULL);
534+
return;
535+
}
536+
537+
ecpg_init_sqlca(sqlca);
538+
528539
for (ptr=ivlist;ptr!=NULL;ptr=ptr->next)
529540
{
530541
if (ptr->number==number)

‎src/interfaces/ecpg/preproc/ecpg.addons‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ECPG: stmtDeallocateStmt block
2222
output_deallocate_prepare_statement($1);
2323
}
2424
ECPG: stmtDeclareCursorStmt block
25-
{ output_simple_statement($1); }
25+
{ output_simple_statement($1, (strncmp($1, "ECPGset_var", strlen("ECPGset_var")) == 0) ? 4 : 0); }
2626
ECPG: stmtDiscardStmt block
2727
ECPG: stmtFetchStmt block
2828
{ output_statement($1, 1, ECPGst_normal); }
@@ -65,7 +65,7 @@ ECPG: stmtViewStmt rule
6565
}
6666
| ECPGCursorStmt
6767
{
68-
output_simple_statement($1);
68+
output_simple_statement($1, (strncmp($1, "ECPGset_var", strlen("ECPGset_var")) == 0) ? 4 : 0);
6969
}
7070
| ECPGDeallocateDescr
7171
{
@@ -75,7 +75,7 @@ ECPG: stmtViewStmt rule
7575
}
7676
| ECPGDeclare
7777
{
78-
output_simple_statement($1);
78+
output_simple_statement($1, 0);
7979
}
8080
| ECPGDescribe
8181
{
@@ -178,14 +178,14 @@ ECPG: stmtViewStmt rule
178178
if (connection)
179179
mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in VAR statement");
180180

181-
output_simple_statement($1);
181+
output_simple_statement($1, 0);
182182
}
183183
| ECPGWhenever
184184
{
185185
if (connection)
186186
mmerror(PARSE_ERROR, ET_ERROR, "AT option not allowed in WHENEVER statement");
187187

188-
output_simple_statement($1);
188+
output_simple_statement($1, 0);
189189
}
190190
ECPG: where_or_current_clauseWHERECURRENT_POFcursor_name block
191191
{
@@ -327,12 +327,7 @@ ECPG: DeclareCursorStmtDECLAREcursor_namecursor_optionsCURSORopt_holdFORSelectSt
327327
}
328328
comment = cat_str(3, mm_strdup("/*"), c1, mm_strdup("*/"));
329329

330-
if ((braces_open > 0) && INFORMIX_MODE) /* we're in a function */
331-
$$ = cat_str(3, adjust_outofscope_cursor_vars(this),
332-
mm_strdup("ECPG_informix_reset_sqlca();"),
333-
comment);
334-
else
335-
$$ = cat2_str(adjust_outofscope_cursor_vars(this), comment);
330+
$$ = cat2_str(adjust_outofscope_cursor_vars(this), comment);
336331
}
337332
ECPG: ClosePortalStmtCLOSEcursor_name block
338333
{

‎src/interfaces/ecpg/preproc/ecpg.trailer‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -339,12 +339,8 @@ ECPGCursorStmt: DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared
339339

340340
comment = cat_str(3, mm_strdup("/*"), mm_strdup(this->command), mm_strdup("*/"));
341341

342-
if ((braces_open > 0) && INFORMIX_MODE) /* we're in a function */
343-
$$ = cat_str(3, adjust_outofscope_cursor_vars(this),
344-
mm_strdup("ECPG_informix_reset_sqlca();"),
342+
$$ = cat_str(2, adjust_outofscope_cursor_vars(this),
345343
comment);
346-
else
347-
$$ = cat2_str(adjust_outofscope_cursor_vars(this), comment);
348344
}
349345
;
350346

‎src/interfaces/ecpg/preproc/output.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ output_line_number(void)
1616
}
1717

1818
void
19-
output_simple_statement(char*stmt)
19+
output_simple_statement(char*stmt,intwhenever_mode)
2020
{
2121
output_escaped_str(stmt, false);
22+
if (whenever_mode)
23+
whenever_action(whenever_mode);
2224
output_line_number();
2325
free(stmt);
2426
}

‎src/interfaces/ecpg/preproc/preproc_extern.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extern void output_line_number(void);
6969
externvoidoutput_statement(char*,int,enumECPG_statement_type);
7070
externvoidoutput_prepare_statement(char*,char*);
7171
externvoidoutput_deallocate_prepare_statement(char*);
72-
externvoidoutput_simple_statement(char*);
72+
externvoidoutput_simple_statement(char*,int);
7373
externchar*hashline_number(void);
7474
externintbase_yyparse(void);
7575
externintbase_yylex(void);

‎src/interfaces/ecpg/test/expected/compat_informix-sqlda.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ if (sqlca.sqlcode < 0) exit (1);}
236236

237237

238238
strcpy(msg,"declare");
239-
ECPG_informix_reset_sqlca();/* declare mycur1 cursor for $1 */
239+
/* declare mycur1 cursor for $1 */
240240
#line 98 "sqlda.pgc"
241241

242242

@@ -311,7 +311,7 @@ if (sqlca.sqlcode < 0) exit (1);}
311311

312312

313313
strcpy(msg,"declare");
314-
ECPG_informix_reset_sqlca();/* declare mycur2 cursor for $1 */
314+
/* declare mycur2 cursor for $1 */
315315
#line 135 "sqlda.pgc"
316316

317317

‎src/interfaces/ecpg/test/expected/compat_informix-test_informix.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,12 @@ if (sqlca.sqlcode < 0) dosqlprint ( );}
148148

149149
sqlca.sqlcode=100;
150150
ECPGset_var(0,&(i ),__LINE__);\
151-
ECPG_informix_reset_sqlca();/* declare c cursor for select * from test where i <= $1 */
151+
/* declare c cursor for select * from test where i <= $1 */
152+
#line 49 "test_informix.pgc"
153+
154+
if (sqlca.sqlcode<0)dosqlprint ( );
155+
#line 49 "test_informix.pgc"
156+
152157
#line 49 "test_informix.pgc"
153158

154159
printf ("%ld\n",sqlca.sqlcode);

‎src/interfaces/ecpg/test/expected/preproc-cursor.c‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ if (sqlca.sqlcode < 0) exit (1);}
185185
/* declare $0 cursor for select id , t from t1 */
186186
#line 64 "cursor.pgc"
187187

188+
if (sqlca.sqlcode<0)exit (1);
189+
#line 64 "cursor.pgc"
190+
191+
#line 64 "cursor.pgc"
192+
188193

189194
strcpy(msg,"open");
190195
{ECPGdo(__LINE__,0,1,"test1",0,ECPGst_normal,"declare $0 cursor for select id , t from t1",
@@ -321,6 +326,11 @@ if (sqlca.sqlcode < 0) exit (1);}
321326
/* declare $0 cursor for select id , t from t1 */
322327
#line 105 "cursor.pgc"
323328

329+
if (sqlca.sqlcode<0)exit (1);
330+
#line 105 "cursor.pgc"
331+
332+
#line 105 "cursor.pgc"
333+
324334

325335
strcpy(msg,"open");
326336
{ECPGdo(__LINE__,0,1,"test1",0,ECPGst_normal,"declare $0 cursor for select id , t from t1",
@@ -475,12 +485,22 @@ if (sqlca.sqlcode < 0) exit (1);}
475485
strcpy(msg,"declare");
476486
ECPGset_var(4,&(curname3 ),__LINE__);\
477487
/* declare $0 cursor for $1 */
488+
#line 149 "cursor.pgc"
489+
490+
if (sqlca.sqlcode<0)exit (1);
491+
#line 149 "cursor.pgc"
492+
478493
#line 149 "cursor.pgc"
479494

480495
ECPGset_var(5,&(curname5 ),__LINE__);\
481496
/* declare $0 cursor for $1 */
482497
#line 150 "cursor.pgc"
483498

499+
if (sqlca.sqlcode<0)exit (1);
500+
#line 150 "cursor.pgc"
501+
502+
#line 150 "cursor.pgc"
503+
484504

485505
strcpy(msg,"open");
486506
{ECPGdo(__LINE__,0,1,"test1",0,ECPGst_normal,"declare $0 cursor for $1",
@@ -661,6 +681,11 @@ if (sqlca.sqlcode < 0) exit (1);}
661681
/* declare $0 cursor for $1 */
662682
#line 203 "cursor.pgc"
663683

684+
if (sqlca.sqlcode<0)exit (1);
685+
#line 203 "cursor.pgc"
686+
687+
#line 203 "cursor.pgc"
688+
664689

665690
strcpy(msg,"open");
666691
{ECPGdo(__LINE__,0,1,"test1",0,ECPGst_normal,"declare $0 cursor for $1",

‎src/interfaces/ecpg/test/expected/preproc-outofscope.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@ get_var1(MYTYPE **myvar0, MYNULLTYPE **mynullvar0)
192192
/* declare mycur cursor for select * from a1 */
193193
#line 28 "outofscope.pgc"
194194

195+
if (sqlca.sqlcode<0)exit (1);
196+
#line 28 "outofscope.pgc"
197+
198+
#line 28 "outofscope.pgc"
199+
195200

196201
if (sqlca.sqlcode!=0)
197202
exit(1);

‎src/interfaces/ecpg/test/expected/sql-binary.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ if (sqlca.sqlcode < 0) exit (1);}
101101

102102
ECPGset_var(0,&(empl.idnum ),__LINE__);\
103103
/* declare C cursor for select name , accs , byte from empl where idnum = $1 */
104+
#line 36 "binary.pgc"
105+
106+
if (sqlca.sqlcode<0)exit (1);
107+
#line 36 "binary.pgc"
108+
104109
#line 36 "binary.pgc"
105110

106111
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"declare C cursor for select name , accs , byte from empl where idnum = $1 ",
@@ -135,6 +140,11 @@ if (sqlca.sqlcode < 0) exit (1);}
135140
memset(empl.name,0,21L);
136141
ECPGset_var(1,&(empl.idnum ),__LINE__);\
137142
/* declare B binary cursor for select name , accs , byte from empl where idnum = $1 */
143+
#line 44 "binary.pgc"
144+
145+
if (sqlca.sqlcode<0)exit (1);
146+
#line 44 "binary.pgc"
147+
138148
#line 44 "binary.pgc"
139149

140150
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"declare B binary cursor for select name , accs , byte from empl where idnum = $1 ",
@@ -172,6 +182,11 @@ if (sqlca.sqlcode < 0) exit (1);}
172182

173183
ECPGset_var(2,&(empl.idnum ),__LINE__);\
174184
/* declare A binary cursor for select byte from empl where idnum = $1 */
185+
#line 55 "binary.pgc"
186+
187+
if (sqlca.sqlcode<0)exit (1);
188+
#line 55 "binary.pgc"
189+
175190
#line 55 "binary.pgc"
176191

177192
{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"declare A binary cursor for select byte from empl where idnum = $1 ",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp