MonetDB: default - Merge with Oct2020 branch.

[Sjoerd Mullender]

Changeset: 5fbd70570fce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5fbd70570fce
Modified Files:
        gdk/gdk_atoms.h
        sql/server/sql_scan.c
Branch: default
Log Message:

Merge with Oct2020 branch.


diffs (24 lines):

diff --git a/gdk/gdk_atoms.h b/gdk/gdk_atoms.h
--- a/gdk/gdk_atoms.h
+++ b/gdk/gdk_atoms.h
@@ -406,7 +406,7 @@ strEQ(const char *l, const char *r)
 static inline bool __attribute__((__pure__))
 strNil(const char *s)
 {
-       return s == NULL || *s == '\200';
+       return s == NULL || (s[0] == '\200' && s[1] == '\0');
 }
 
 static inline size_t __attribute__((__pure__))
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -30,7 +30,7 @@
 char *
 query_cleaned(sql_allocator *sa, const char *query)
 {
-       char *q, *r, *c;
+       char *q, *r, *c = NULL;
        int lines = 0;
        int quote = 0;          /* inside quotes ('..', "..", {..}) */
        bool bs = false;                /* seen a backslash in a quoted string 
*/
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list