Changeset 2085

Timestamp:

06/03/09 14:06:07 (15 months ago)

Author:

drobilla

Message:

Fix memory leaks.
Avoid unnecessary URI copy on plugin load.

Location:

trunk/slv2/src

Files:

• plugin.c (modified) (1 diff)
• world.c (modified) (6 diffs)

trunk/slv2/src/plugin.c

@@ -209 +209 @@
         for (unsigned i=0; i < slv2_values_size(p->data_uris); ++i) {
                 SLV2Value data_uri_val = slv2_values_get_at(p->data_uris, i);
-                librdf_uri* data_uri = librdf_new_uri(p->world->world,
-                                (const unsigned char*)slv2_value_as_uri(data_uri_val));
+                librdf_uri* data_uri = slv2_value_as_librdf_uri(data_uri_val);
                 librdf_parser_parse_into_model(p->world->parser, data_uri, NULL, p->rdf);
-                librdf_free_uri(data_uri);
         }
 }

trunk/slv2/src/world.c

@@ -177 +177 @@
 slv2_world_load_bundle(SLV2World world, SLV2Value bundle_uri)
 {
+        if (!slv2_value_is_uri(bundle_uri)) {
+                fprintf(stderr, "ERROR: slv2_world_load_bundle called with non-URI argument\n");
+                return;
+        }
+
         librdf_uri* manifest_uri = librdf_new_uri_relative_to_base(
                         bundle_uri->val.uri_val, (const unsigned char*)"manifest.ttl");
@@ -465 +470 @@
                         }
 
-                        SLV2Value uri = slv2_value_new_librdf_uri(world, class_uri);
-
                         // If this class differs from the last, append a new one
                         if (!plugin_class) {
@@ -492 +495 @@
                                         // Otherwise the query engine is giving us unsorted results :/
                                         } else {
+                                                SLV2Value uri = slv2_value_new_librdf_uri(world, class_uri);
                                                 plugin_class = slv2_plugin_classes_get_by_uri(classes, uri);
                                                 if (!plugin_class) {
@@ -498 +502 @@
                                                         raptor_sequence_sort(classes, slv2_plugin_class_compare_by_uri);
                                                 }
+                                                slv2_value_free(uri);
                                         }
                                 }
@@ -588 +593 @@
                         }
 
-                        SLV2Value uri = slv2_value_new_librdf_uri(world, plugin_uri);
-
                         // If this plugin differs from the last, append a new one
                         if (!plugin) {
+                                SLV2Value uri = slv2_value_new_librdf_uri(world, plugin_uri);
                                 if (n_plugins == 0) {
                                         plugin = slv2_plugin_new(world, uri, bundle_uri);
@@ -620 +624 @@
                                                         raptor_sequence_push(world->plugins, plugin);
                                                         raptor_sequence_sort(world->plugins, slv2_plugin_compare_by_uri);
+                                                } else {
+                                                        slv2_value_free(uri);
                                                 }
                                         }