MonetDB: SciQL-2 - SCIQLmaterialise(): use correct type for strl...

[Stefan Manegold]

Changeset: a36ad0a3f103 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a36ad0a3f103
Modified Files:
        sql/backends/monet5/sciql.c
Branch: SciQL-2
Log Message:

SCIQLmaterialise(): use correct type for strlen, added required casts and 
sanity/overflow checks


diffs (22 lines):

diff --git a/sql/backends/monet5/sciql.c b/sql/backends/monet5/sciql.c
--- a/sql/backends/monet5/sciql.c
+++ b/sql/backends/monet5/sciql.c
@@ -159,7 +159,7 @@ SCIQLmaterialise(Client cntxt, MalBlkPtr
                        
                        src.vtype = TYPE_str;
                        if (sc->def) {
-                               int l = strlen(sc->def);
+                               size_t l = strlen(sc->def);
                                if (l == 4 && (sc->def[0] == 'n' || sc->def[0] 
== 'N') &&
                                                (sc->def[1] == 'u' || 
sc->def[1] == 'U') &&
                                                (sc->def[2] == 'l' || 
sc->def[2] == 'L') &&
@@ -168,7 +168,8 @@ SCIQLmaterialise(Client cntxt, MalBlkPtr
                                        src.len = 0;
                                } else {
                                        src.val.sval = sc->def;
-                                       src.len = l;
+                                       assert(l < (size_t) GDK_int_max);
+                                       src.len = (int) l;
                                }
                        } else {
                                src.val.sval = sc->def;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list