Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23533/src/backends/monet5
Modified Files:
sql_scenario.mx
Log Message:
propagated changes of Wednesday Feb 10 2010 - Friday Feb 12 2010
from the Feb2010 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/02/10 - sjoerd: src/backends/monet5/sql_scenario.mx,1.372.2.2
If we first blindly dereference a value, we don't have to check later
whether that value can be dereferenced.
Found by Coverity.
Niels, please check correctness: is m->session really != NULL.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- sql_scenario.mx 28 Jan 2010 12:51:53 -0000 1.373
+++ sql_scenario.mx 12 Feb 2010 09:36:30 -0000 1.374
@@ -458,6 +458,7 @@
if ( m == NULL)
throw(SQL, "SQLexitClient", "MVC catalogue not
available");
+ assert(m->session);
if (m->session->auto_commit && m->session->active) {
if (mvc_status(m) >= 0 && mvc_commit(m, 0, NULL) < 0)
(void) handle_error(m, c->fdout, 0);
@@ -468,7 +469,7 @@
res_tables_destroy(m->results);
m->results= NULL;
- if (m->session && m->session->tr)
+ if (m->session->tr)
reset_functions(m->session->tr);
}
c->state[MAL_SCENARIO_READER] = NULL;
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
