Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8945/src/server
Modified Files:
rel_bin.mx
Log Message:
propagated changes of Wednesday Dec 23 2009 - Saturday Dec 26 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/23 - sjoerd: src/server/rel_bin.mx,1.93.2.5
In the unlikely event that exp_bin returns NULL, don't dereference.
Found by Coverity.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- rel_bin.mx 13 Dec 2009 20:33:16 -0000 1.104
+++ rel_bin.mx 26 Dec 2009 10:56:37 -0000 1.105
@@ -1578,6 +1578,8 @@
assert(e->type == e_cmp && e->flag == cmp_equal);
s = exp_bin(sql, e->r, NULL, NULL, NULL, NULL);
+ if (s == NULL)
+ return NULL;
if (!s) {
stmt_destroy(h);
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
