MonetDB: Jan2014 - Fix potential null dereference.

[Sjoerd Mullender]

Changeset: 51a182fe8999 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51a182fe8999
Modified Files:
        monetdb5/modules/mal/tablet.c
Branch: Jan2014
Log Message:

Fix potential null dereference.


diffs (22 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
@@ -1557,12 +1557,13 @@ SQLload_file(Client cntxt, Tablet *as, b
 
   bailout:
        if (task) {
-               for (i = 0; i < as->nr_attrs; i++) {
-                       if (task->fields[i])
-                               GDKfree(task->fields[i]);
+               if (task->fields) {
+                       for (i = 0; i < as->nr_attrs; i++) {
+                               if (task->fields[i])
+                                       GDKfree(task->fields[i]);
+                       }
+                       GDKfree(task->fields);
                }
-               if (task->fields)
-                       GDKfree(task->fields);
                if (task->time)
                        GDKfree(task->time);
                if (task->cols)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list