Fix some memory leaks, including one very serious one in the backend

dajobe · Feb 11, 2011 · 9367486 · 9367486
1 parent 17a6e84
commit 9367486
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/backend/server.c b/src/backend/server.c
@@ -930,6 +930,7 @@ static unsigned char * handle_resolve_attr (fs_backend *be, fs_segment segment,
 /* ASCII NUL is used to terminate strings on the wire */
     if (resources[k].lex) {
       strcpy((char *) record + 20, resources[k].lex);
+      free(resources[k].lex);
     } else {
       *(record + 20) = '\0';
     }

diff --git a/src/frontend/query.c b/src/frontend/query.c
@@ -847,13 +847,15 @@ int fs_query_process_pattern(fs_query *q, rasqal_graph_pattern *pattern, raptor_
                         fs_binding *old = q->bb[j];
                         q->bb[j] = fs_binding_apply_filters(q, j, q->bb[j], q->constraints[j]);
                         fs_binding_free(old);
+                        raptor_free_sequence(q->constraints[j]);
                         q->constraints[j] = NULL;
                     }
                 } else {
                     if (q->constraints[j]) {
                         fs_binding *old = q->bb[j];
                         q->bb[j] = fs_binding_apply_filters(q, j, q->bb[j], q->constraints[j]);
                         fs_binding_free(old);
+                        raptor_free_sequence(q->constraints[j]);
                         q->constraints[j] = NULL;
                     }
                     fs_binding_union(q, q->bb[first_in_union], q->bb[j]);
@@ -925,6 +927,7 @@ int fs_query_process_pattern(fs_query *q, rasqal_graph_pattern *pattern, raptor_
                     fs_binding *old = q->bb[j];
                     q->bb[j] = fs_binding_apply_filters(q, j, q->bb[j], q->constraints[j]);
                     fs_binding_free(old);
+                    raptor_free_sequence(q->constraints[j]);
                     q->constraints[j] = NULL;
                     /* do the left join */
                     fs_binding *nb = fs_binding_join(q, q->bb[i], q->bb[j], FS_LEFT);
@@ -962,9 +965,6 @@ void fs_query_free(fs_query *q)
         if (q->blocks) {
             for (int i=0; i<FS_MAX_BLOCKS; i++) {
                 if (q->blocks[i].data) {
-                    for (int j=0; j<q->blocks[i].length; j++) {
-                        free(q->blocks[i].data[j]);
-                    }
                     free(q->blocks[i].data);
                 }
             }
@@ -1257,6 +1257,7 @@ static void graph_pattern_walk(fsp_link *link, rasqal_graph_pattern *pattern,
 	rasqal_triple *rt = rasqal_graph_pattern_get_triple(pattern, i);
 	if (!rt) break;
         rasqal_triple *t = calloc(1, sizeof(rasqal_triple));
+        fs_query_add_freeable(q, t);
         t->origin = model;
         t->subject = rt->subject;
         t->predicate = rt->predicate;

diff --git a/src/frontend/results.c b/src/frontend/results.c
@@ -1440,6 +1440,9 @@ static void handle_construct(fs_query *q, const char *type, FILE *output)
                 st.predicate = slot_fill(q, trip->predicate, row);
                 st.object = slot_fill(q, trip->object, row);
                 raptor_serializer_serialize_statement(q->ser, &st);
+                raptor_free_term(st.subject);
+                raptor_free_term(st.predicate);
+                raptor_free_term(st.object);
             }
         }
     }
@@ -1471,6 +1474,9 @@ static void handle_construct(fs_query *q, const char *type, FILE *output)
                 st.predicate = slot_fill(q, trip->predicate, row);
                 st.object = slot_fill(q, trip->object, row);
                 raptor_serializer_serialize_statement(q->ser, &st);
+                raptor_free_term(st.subject);
+                raptor_free_term(st.predicate);
+                raptor_free_term(st.object);
             }
         }
     }