diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-01-24 16:46:55 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-01-24 16:47:06 -0500 |
| commit | d5a1fde397269bd60b99e70a4eb2934b75fd31ec (patch) | |
| tree | 16b5d39d7efe4be09c2baa281d39028bc1907b1b /src/interfaces/ecpg/test/expected/sql-fetch.c | |
| parent | bbd5c207b960dd072445a3547f16abea0c27f726 (diff) | |
| download | postgresql-d5a1fde397269bd60b99e70a4eb2934b75fd31ec.tar.gz postgresql-d5a1fde397269bd60b99e70a4eb2934b75fd31ec.zip | |
Remove infinite-loop hazards in ecpg test suite.
A report from Andrew Dunstan showed that an ecpglib breakage that
causes repeated query failures could lead to infinite loops in some
ecpg test scripts, because they contain "while(1)" loops with no
exit condition other than successful test completion. That might
be all right for manual testing, but it seems entirely unacceptable
for automated test environments such as our buildfarm. We don't
want buildfarm owners to have to intervene manually when a test
goes wrong.
To fix, just change all those while(1) loops to exit after at most
100 iterations (which is more than any of them expect to iterate).
This seems sufficient since we'd see discrepancies in the test output
if any loop executed the wrong number of times.
I tested this by dint of intentionally breaking ecpg_do_prologue
to always fail, and verifying that the tests still got to completion.
Back-patch to all supported branches, since the whole point of this
exercise is to protect the buildfarm against future mistakes.
Discussion: https://postgr.es/m/18693.1548302004@sss.pgh.pa.us
Diffstat (limited to 'src/interfaces/ecpg/test/expected/sql-fetch.c')
| -rw-r--r-- | src/interfaces/ecpg/test/expected/sql-fetch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/ecpg/test/expected/sql-fetch.c b/src/interfaces/ecpg/test/expected/sql-fetch.c index b547b25c7a8..b1b13aeb752 100644 --- a/src/interfaces/ecpg/test/expected/sql-fetch.c +++ b/src/interfaces/ecpg/test/expected/sql-fetch.c @@ -25,13 +25,13 @@ int main() { /* exec sql begin declare section */ - + #line 9 "fetch.pgc" char str [ 25 ] ; #line 10 "fetch.pgc" - int i , count = 1 ; + int i , count = 1 , loopcount ; /* exec sql end declare section */ #line 11 "fetch.pgc" @@ -112,7 +112,7 @@ if (sqlca.sqlcode < 0) sqlprint();} /* exec sql whenever not found break ; */ #line 30 "fetch.pgc" - while (1) { + for (loopcount = 0; loopcount < 100; loopcount++) { { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch 1 in C", ECPGt_EOIT, ECPGt_int,&(i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, @@ -191,7 +191,7 @@ if (sqlca.sqlcode < 0) sqlprint();} /* exec sql whenever not found break ; */ #line 48 "fetch.pgc" - while (1) { + for (loopcount = 0; loopcount < 100; loopcount++) { { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch 1 in D", ECPGt_EOIT, ECPGt_int,&(i),(long)1,(long)1,sizeof(int), ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, |