Update of /cvsroot/monetdb/pathfinder/compiler/schema
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3972/compiler/schema
Modified Files:
Tag: M5XQ
import.c
Log Message:
propagated changes of Tuesday Jan 12 2010
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/12 - sjoerd: compiler/schema/import.c,1.30.10.2
propagated changes of Tuesday Jan 12 2010
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/12 - sjoerd: compiler/schema/import.c,1.32
propagated changes of Monday Jan 11 2010 - Tuesday Jan 12 2010
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/01/11 - sjoerd: compiler/schema/import.c,1.30.6.2
Check that map_closing_tag doesn't return HOLE.
Found by Coverity.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: import.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/schema/import.c,v
retrieving revision 1.29.4.2
retrieving revision 1.29.4.3
diff -u -d -r1.29.4.2 -r1.29.4.3
--- import.c 8 Jan 2010 09:06:59 -0000 1.29.4.2
+++ import.c 12 Jan 2010 09:41:28 -0000 1.29.4.3
@@ -794,7 +794,7 @@
}
/**
- * Callback invoked whenever the see a closing tag </t>.
+ * Callback invoked whenever we see a closing tag </t>.
*
* @param SAX parser context
* @param t tag name
@@ -811,7 +811,7 @@
closing_tag = map_closing_tag (ctx, (char *) t);
/* perform type mapping DFA transition */
- if (dfa[state][closing_tag] == HOLE) {
+ if (closing_tag == HOLE || dfa[state][closing_tag] == HOLE) {
PFinfo (OOPS_SCHEMAIMPORT, "unexpected </%s>", t);
xmlParserError (ctx, "\n");
PFoops (OOPS_SCHEMAIMPORT, "check schema well-formedness");
------------------------------------------------------------------------------
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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
