Skip to content

Commit e05c5a9

Browse files
author
Michael Meskes
committed
Applied patch by ITAGAKI Takahiro <itagaki.takahiro@oss.ntt.co.jp> to
fix segfault on non-glibc systems.
1 parent dcf8409 commit e05c5a9

File tree

3 files changed

+36
-47
lines changed

3 files changed

+36
-47
lines changed

src/interfaces/ecpg/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2400,6 +2400,11 @@ Wed, 26 Nov 2008 14:09:08 +0100
24002400
Mon, 15 Dec 2008 16:31:31 +0100
24012401

24022402
- Do not try to change a const variable in ecpg_log.
2403+
2404+
Wed, 17 Dec 2008 17:49:11 +0100
2405+
2406+
- Applied patch by ITAGAKI Takahiro <itagaki.takahiro@oss.ntt.co.jp> to
2407+
fix segfault on non-glibc systems.
24032408
- Set pgtypes library version to 3.1.
24042409
- Set compat library version to 3.1.
24052410
- Set ecpg library version to 6.2.

src/interfaces/ecpg/ecpglib/connect.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.51 2008/05/16 15:20:03 petere Exp $ */
1+
/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.52 2008/12/17 16:52:07 meskes Exp $ */
22

33
#define POSTGRES_ECPG_INTERNAL
44
#include "postgres_fe.h"
@@ -144,7 +144,7 @@ ecpg_finish(struct connection * act)
144144
if (actual_connection == act)
145145
actual_connection = all_connections;
146146

147-
ecpg_log("ecpg_finish: connection %s closed\n", act->name);
147+
ecpg_log("ecpg_finish: connection %s closed\n", act->name ? act->name : "(null)");
148148

149149
for (cache = act->cache_head; cache; ptr = cache, cache = cache->next, ecpg_free(ptr));
150150
ecpg_free(act->name);
Lines changed: 29 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,64 @@
11
[NO_PID]: ECPGdebug: set to 1
22
[NO_PID]: sqlca: code: 0, state: 00000
3-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
3+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>
44
[NO_PID]: sqlca: code: 0, state: 00000
5-
[NO_PID]: ECPGexecute line 23: QUERY: alter user connectuser encrypted password 'connectpw' on connection main
5+
[NO_PID]: ecpg_execute on line 23: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
66
[NO_PID]: sqlca: code: 0, state: 00000
7-
[NO_PID]: ECPGexecute line 23 Ok: ALTER ROLE
7+
[NO_PID]: ecpg_execute on line 23: using PQexec
88
[NO_PID]: sqlca: code: 0, state: 00000
9-
[NO_PID]: ecpg_finish: Connection main closed.
9+
[NO_PID]: ecpg_execute on line 23: OK: ALTER ROLE
1010
[NO_PID]: sqlca: code: 0, state: 00000
11-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <DEFAULT>
11+
[NO_PID]: ecpg_finish: connection main closed
1212
[NO_PID]: sqlca: code: 0, state: 00000
13-
[NO_PID]: ecpg_finish: Connection main closed.
13+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <DEFAULT>
1414
[NO_PID]: sqlca: code: 0, state: 00000
15-
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb
15+
[NO_PID]: ecpg_finish: connection main closed
1616
[NO_PID]: sqlca: code: 0, state: 00000
17-
[NO_PID]: ecpg_finish: Connection main closed.
17+
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb
1818
[NO_PID]: sqlca: code: 0, state: 00000
19-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT>
19+
[NO_PID]: ecpg_finish: connection main closed
2020
[NO_PID]: sqlca: code: 0, state: 00000
21-
[NO_PID]: ecpg_finish: Connection main closed.
21+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <DEFAULT> for user connectuser
2222
[NO_PID]: sqlca: code: 0, state: 00000
23-
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <REGRESSION_PORT> for user connectdb
23+
[NO_PID]: ecpg_finish: connection connectdb closed
2424
[NO_PID]: sqlca: code: 0, state: 00000
25-
[NO_PID]: ecpg_finish: Connection main closed.
25+
[NO_PID]: ECPGconnect: opening database <DEFAULT> on localhost port <DEFAULT> for user connectdb
2626
[NO_PID]: sqlca: code: 0, state: 00000
27-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT>
27+
[NO_PID]: ecpg_finish: connection (null) closed
2828
[NO_PID]: sqlca: code: 0, state: 00000
29-
[NO_PID]: ecpg_finish: Connection main closed.
29+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <DEFAULT> for user connectuser
3030
[NO_PID]: sqlca: code: 0, state: 00000
31-
[NO_PID]: ECPGconnect: opening database <DEFAULT> on <DEFAULT> port <REGRESSION_PORT> for user connectdb
31+
[NO_PID]: ecpg_finish: connection connectdb closed
3232
[NO_PID]: sqlca: code: 0, state: 00000
33-
[NO_PID]: ecpg_finish: Connection main closed.
33+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT> for user connectuser
3434
[NO_PID]: sqlca: code: 0, state: 00000
35-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
35+
[NO_PID]: ecpg_finish: connection connectdb closed
3636
[NO_PID]: sqlca: code: 0, state: 00000
37-
[NO_PID]: ecpg_finish: Connection connectdb closed.
37+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT> with options connect_timeout=14 for user connectuser
3838
[NO_PID]: sqlca: code: 0, state: 00000
39-
[NO_PID]: ECPGconnect: opening database on localhost port <REGRESSION_PORT> for user connectdb
39+
[NO_PID]: ecpg_finish: connection connectdb closed
4040
[NO_PID]: sqlca: code: 0, state: 00000
41-
[NO_PID]: ecpg_finish: Connection closed.
41+
[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <DEFAULT> for user connectuser
4242
[NO_PID]: sqlca: code: 0, state: 00000
43-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
44-
[NO_PID]: sqlca: code: 0, state: 00000
45-
[NO_PID]: ecpg_finish: Connection connectdb closed.
46-
[NO_PID]: sqlca: code: 0, state: 00000
47-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
48-
[NO_PID]: sqlca: code: 0, state: 00000
49-
[NO_PID]: ecpg_finish: Connection connectdb closed.
50-
[NO_PID]: sqlca: code: 0, state: 00000
51-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
52-
[NO_PID]: sqlca: code: 0, state: 00000
53-
[NO_PID]: ecpg_finish: Connection connectdb closed.
54-
[NO_PID]: sqlca: code: 0, state: 00000
55-
[NO_PID]: ECPGconnect: opening database nonexistant on localhost port <REGRESSION_PORT> for user connectuser
56-
[NO_PID]: sqlca: code: 0, state: 00000
57-
[NO_PID]: connect: could not open database nonexistant on localhost port <REGRESSION_PORT> for user connectuser in line 62
58-
FATAL: database "nonexistant" does not exist
43+
[NO_PID]: ECPGconnect: could not open database: FATAL: database "nonexistant" does not exist
5944

6045
[NO_PID]: sqlca: code: 0, state: 00000
61-
[NO_PID]: ecpg_finish: Connection nonexistant closed.
46+
[NO_PID]: ecpg_finish: connection nonexistant closed
6247
[NO_PID]: sqlca: code: 0, state: 00000
63-
[NO_PID]: raising sqlcode -402 in line 62, 'Could not connect to database nonexistant in line 62.'.
48+
[NO_PID]: raising sqlcode -402 on line 53: could not connect to database "nonexistant" on line 53
6449
[NO_PID]: sqlca: code: -402, state: 08001
65-
[NO_PID]: raising sqlcode -220 in line 63, 'No such connection CURRENT in line 63.'.
50+
[NO_PID]: raising sqlcode -220 on line 54: no such connection CURRENT on line 54
6651
[NO_PID]: sqlca: code: -220, state: 08003
67-
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
52+
[NO_PID]: ECPGconnect: opening database connectdb on localhost port <REGRESSION_PORT> for user connectuser
6853
[NO_PID]: sqlca: code: 0, state: 00000
69-
[NO_PID]: connect: could not open database connectdb on localhost port <REGRESSION_PORT> for user connectuser in line 66
70-
could not connect to server: Connection refused (0x0000274D/10061)
54+
[NO_PID]: ECPGconnect: could not open database: could not connect to server: Connection refused (0x0000274D/10061)
7155
Is the server running on host "localhost" and accepting
7256
TCP/IP connections on port 20?
7357

7458
[NO_PID]: sqlca: code: 0, state: 00000
75-
[NO_PID]: ecpg_finish: Connection connectdb closed.
59+
[NO_PID]: ecpg_finish: connection connectdb closed
7660
[NO_PID]: sqlca: code: 0, state: 00000
77-
[NO_PID]: raising sqlcode -402 in line 66, 'Could not connect to database connectdb in line 66.'.
61+
[NO_PID]: raising sqlcode -402 on line 57: could not connect to database "connectdb" on line 57
7862
[NO_PID]: sqlca: code: -402, state: 08001
79-
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <REGRESSION_PORT> for user connectuser
63+
[NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT> for user connectuser
8064
[NO_PID]: sqlca: code: 0, state: 00000

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy