From 2a781b5bb260209be0d856c6a43d15194d6848e0 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Mon, 15 Jun 2015 14:21:03 +0200 Subject: Check for out of memory when allocating sqlca. Patch by Michael Paquier --- src/interfaces/ecpg/ecpglib/error.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/interfaces/ecpg/ecpglib/error.c') diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c index 715bedba80f..656b2c420ac 100644 --- a/src/interfaces/ecpg/ecpglib/error.c +++ b/src/interfaces/ecpg/ecpglib/error.c @@ -14,6 +14,13 @@ ecpg_raise(int line, int code, const char *sqlstate, const char *str) { struct sqlca_t *sqlca = ECPGget_sqlca(); + if (sqlca == NULL) + { + ecpg_log("out of memory"); + ECPGfree_auto_mem(); + return; + } + sqlca->sqlcode = code; strncpy(sqlca->sqlstate, sqlstate, sizeof(sqlca->sqlstate)); @@ -215,6 +222,13 @@ ecpg_raise_backend(int line, PGresult *result, PGconn *conn, int compat) char *sqlstate; char *message; + if (sqlca == NULL) + { + ecpg_log("out of memory"); + ECPGfree_auto_mem(); + return; + } + if (result) { sqlstate = PQresultErrorField(result, PG_DIAG_SQLSTATE); @@ -323,6 +337,12 @@ sqlprint(void) { struct sqlca_t *sqlca = ECPGget_sqlca(); + if (sqlca == NULL) + { + ecpg_log("out of memory"); + return; + } + sqlca->sqlerrm.sqlerrmc[sqlca->sqlerrm.sqlerrml] = '\0'; fprintf(stderr, ecpg_gettext("SQL error: %s\n"), sqlca->sqlerrm.sqlerrmc); } -- cgit v1.2.3