Update of /cvsroot/monetdb/pathfinder/runtime
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8657/runtime

Modified Files:
      Tag: M5XQ
        shredder.mx 
Log Message:
propagated changes of Sunday Feb 21 2010
from the XQFT branch to the M5XQ branch

  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2010/02/21 - stmane: runtime/shredder.mx,1.160.2.3
  propagated changes of Sunday Feb 21 2010
  from the development trunk to the XQFT branch
  
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2010/02/21 - stmane: runtime/shredder.mx,1.163
    propagated changes of Thursday Feb 18 2010 - Sunday Feb 21 2010
    from the Feb2010 branch to the development trunk
  
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      2010/02/18 - sjoerd: runtime/shredder.mx,1.162.2.1
      If there is no DTD, I guess there is not much point continuing.
      Found by Coverity.
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: shredder.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/shredder.mx,v
retrieving revision 1.158.2.4
retrieving revision 1.158.2.5
diff -u -d -r1.158.2.4 -r1.158.2.5
--- shredder.mx 8 Jan 2010 09:11:47 -0000       1.158.2.4
+++ shredder.mx 21 Feb 2010 21:45:36 -0000      1.158.2.5
@@ -1362,8 +1362,10 @@
                 ctx->myDoc = xmlNewDoc(ctx->version);
             }
                 
-            if (!dtd)
+            if (!dtd) {
                 GDKerror("shred_external_subset: problem with reading external 
DTD (\"%s\")\n", SystemID);
+                BAILOUT(shredCtx);
+            }
 
             if (ctx->myDoc->extSubset) {
                 stream_printf(GDKout, "!WARNING: double external subset 
(\"%s\") may cause problems.\n", SystemID);


------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to