Update of /cvsroot/monetdb/sql/src/server
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30251
Modified Files:
Tag: Nov2009
rel_optimizer.mx
Log Message:
Test for NULL before dereference.
Found by Coverity.
Index: rel_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_optimizer.mx,v
retrieving revision 1.71.2.6
retrieving revision 1.71.2.7
diff -u -d -r1.71.2.6 -r1.71.2.7
--- rel_optimizer.mx 2 Dec 2009 11:49:29 -0000 1.71.2.6
+++ rel_optimizer.mx 2 Dec 2009 12:45:52 -0000 1.71.2.7
@@ -2037,11 +2037,11 @@
if (je->card >= CARD_ATOM && je->type
== e_cmp && je->flag != cmp_or) {
/* expect right expression to
match */
sql_exp *r = je->r;
- if (r->type != e_column)
+ if (r == 0 || r->type !=
e_column)
continue;
- if (r && r->l && rname &&
strcmp(r->l, rname) == 0 && strcmp(r->r,gbe->name)==0) {
+ if (r->l && rname &&
strcmp(r->l, rname) == 0 && strcmp(r->r,gbe->name)==0) {
fnd = 1;
- } else if (r && !r->l && !rname
&& strcmp(r->r,gbe->name)==0) {
+ } else if (!r->l && !rname &&
strcmp(r->r,gbe->name)==0) {
fnd = 1;
}
if (fnd) {
------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing.
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
