Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20948/server

Modified Files:
      Tag: SQL_2-20
        sql_parser.mx 
Log Message:
fixed bug in xml attribute parsing.


Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.256.2.6
retrieving revision 1.256.2.7
diff -u -d -r1.256.2.6 -r1.256.2.7
--- sql_parser.mx       30 Nov 2007 20:09:06 -0000      1.256.2.6
+++ sql_parser.mx       19 Dec 2007 21:54:13 -0000      1.256.2.7
@@ -5032,12 +5032,17 @@
 static symbol* 
 str2atom(sql_allocator *sa, str x)
 { 
-       char *s = sql2str(x);
-       int len = _strlen(s);
-       sql_subtype t;
+       atom *a = NULL;
 
-       sql_find_subtype(&t, "char", len, 0 );
-       return newAtomNode( sa,  atom_string(&t, s, 0)); 
+       if (x) {
+               char *s = sql2str(x);
+               int len = _strlen(s);
+               sql_subtype t;
+
+               sql_find_subtype(&t, "char", len, 0 );
+               a = atom_string(&t, s, 0); 
+       }
+       return newAtomNode( sa,  a); 
 }
 
 void *sql_error( mvc * sql, int error_code, char *format, ... )


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to