Changeset: 7f39d120124c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f39d120124c
Modified Files:
        sql/backends/monet5/sql_cquery.c
Branch: trails
Log Message:

Be carefull to not differ pointers from freed baskets


diffs (19 lines):

diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -87,11 +87,15 @@ cleanBaskets(int idx) //Always called wi
 
        for(m=0; m< MAXSTREAMS && pnet[idx].baskets[m]; m++) {
                found = 0;
+               if (!baskets[pnet[idx].baskets[m]].table)
+                       continue;
                sch = baskets[pnet[idx].baskets[m]].table->s->base.name;
                tbl = baskets[pnet[idx].baskets[m]].table->base.name;
                for(n=0; n < pnettop && !found; n++) {
                        if(n != idx) {
                                for(o=0; o< MAXSTREAMS && pnet[n].baskets[o] && 
!found; o++) {
+                                       if (!baskets[pnet[n].baskets[o]].table)
+                                               continue;
                                        if (strcmp(sch, 
baskets[pnet[n].baskets[o]].table->s->base.name) == 0 &&
                                                strcmp(tbl, 
baskets[pnet[n].baskets[o]].table->base.name) == 0)
                                                found = 1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to