Changeset: 8b8406d78d88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b8406d78d88
Modified Files:
monetdb5/modules/mal/tablet.c
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (21 lines):
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -818,13 +818,15 @@ SQLinsert_val(READERtask *task, int col,
fmt->c->tnonil = false;
} else {
if (task->escape) {
- char *data = GDKmalloc(strlen(s) + 1);
+ size_t slen = strlen(s) + 1;
+ char *data = slen <= sizeof(buf) ? buf :
GDKmalloc(strlen(s) + 1);
if (data == NULL ||
GDKstrFromStr((unsigned char *) data, (unsigned
char *) s, strlen(s)) < 0)
adt = NULL;
else
adt = fmt->frstr(fmt, fmt->adt, data);
- GDKfree(data);
+ if (data != buf)
+ GDKfree(data);
} else
adt = fmt->frstr(fmt, fmt->adt, s);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
