Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8970/src/server
Modified Files:
rel_select.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_select.mx,1.157.2.5
Protect against NULL redirection.
Found by Coverity.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_select.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_select.mx,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- rel_select.mx 13 Dec 2009 20:33:16 -0000 1.163
+++ rel_select.mx 26 Dec 2009 10:56:42 -0000 1.164
@@ -3487,8 +3487,10 @@
if (opt_else || else_exp) {
sql_exp *result = else_exp;
- if (!result)
- result = rel_value_exp(sql, rel, opt_else, f, ek);
+ if (!result && !(result = rel_value_exp(sql, rel, opt_else, f,
ek))) {
+ list_destroy(conds);
+ return NULL;
+ }
tpe = exp_subtype(result);
if (tpe && restype) {
------------------------------------------------------------------------------
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
