Changeset: d8f9b1b2ebcf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8f9b1b2ebcf
Modified Files:
sql/backends/monet5/mal_backend.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
More malloc failure defense lines for SQL backend
diffs (36 lines):
diff --git a/sql/backends/monet5/mal_backend.c
b/sql/backends/monet5/mal_backend.c
--- a/sql/backends/monet5/mal_backend.c
+++ b/sql/backends/monet5/mal_backend.c
@@ -30,6 +30,8 @@ backend_create(mvc *m, Client c)
// FIXME unchecked_malloc MNEW can return NULL
backend *b = MNEW(backend);
+ if( b== NULL)
+ return NULL;
b->console = isAdministrator(c);
b->mvc = m;
b->client = c;
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -396,6 +396,8 @@ SQLstatementIntern(Client c, str *expr,
m->type = Q_PARSE;
be = sql;
sql = backend_create(m, c);
+ if( sql == NULL)
+ throw(SQL,"SQLstatement",MAL_MALLOC_FAIL);
sql->output_format = be->output_format;
if (!output) {
sql->output_format = OFMT_NONE;
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -457,6 +457,8 @@ SQLinitClient(Client c)
if (isAdministrator(c) || strcmp(c->scenario, "msql") == 0)
/* console should return everything */
m->reply_size = -1;
be = (void *) backend_create(m, c);
+ if( be == NULL)
+ throw(SQL,"sql.init", MAL_MALLOC_FAIL);
} else {
be = c->sqlcontext;
m = be->mvc;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
