Changeset: aedcd743f056 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aedcd743f056
Modified Files:
monetdb5/modules/mal/tablet.c
Branch: Jul2015
Log Message:
Add NULL pointer check.
This fixes bug 3987.
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
@@ -1103,7 +1103,7 @@ SQLload_parse_line(READERtask *task, int
}
endofline:
/* check for too many values as well*/
- if (*line && i == as->nr_attrs) {
+ if (line && *line && i == as->nr_attrs) {
errline = SQLload_error(task, idx, task->as->nr_attrs);
snprintf(errmsg, BUFSIZ, "Leftover data '%s'",line);
tablet_error(task, idx, (int) i, errmsg, errline);
@@ -1112,7 +1112,7 @@ endofline:
}
#ifdef _DEBUG_TABLET_
if (error)
- mnstr_printf(GDKout, "#line break failed %d:%s\n", idx, line);
+ mnstr_printf(GDKout, "#line break failed %d:%s\n", idx, line ?
line : "EOF");
#endif
return error ? -1 : 0;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
