MonetDB: Jul2015 - Check for number of Unicode code points inste...

[Sjoerd Mullender]

Changeset: 535bb896b400 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=535bb896b400
Modified Files:
        sql/backends/monet5/sql_result.c
Branch: Jul2015
Log Message:

Check for number of Unicode code points instead of bytes.


diffs (23 lines):

diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -639,7 +639,7 @@ static void *
 
        if (type == TYPE_str) {
                sql_column *col = (sql_column *) c->extra;
-               int len;
+               int len, slen;
 
                for (e = s; *e; e++) ;
                len = (int) (e - s + 1);        /* 64bit: should check for 
overflow */
@@ -665,7 +665,9 @@ static void *
                        /* or shouldn't len rather be ssize_t, here? */
                        return NULL;
                }
-               if (col->type.digits > 0 && len > 0 && len > (int) 
col->type.digits) {
+               s = c->data;
+               STRLength(&slen, (const str *) &s);
+               if (col->type.digits > 0 && len > 0 && slen > (int) 
col->type.digits) {
                        len = STRwidth(c->data);
                        if (len > (int) col->type.digits)
                                return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list