Changeset 95979c0 in lilv


Ignore:
Timestamp:
Oct 28, 2015, 9:43:41 PM (2 years ago)
Author:
David Robillard <d@…>
Branches:
master
Children:
07dadda
Parents:
32a4463
Message:

Fix loading dynamic manifest from bundles with spaces

git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@5799 a436a847-0d15-0410-975c-d299462d15a1

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEWS

    r32a4463 r95979c0  
    33  * Unload contained resources when bundle is unloaded
    44  * Support re-loading plugins
     5  * Fix loading dyn-manifest from bundles with spaces in their path
    56  * Fix Python bindings
    67  * Fix documentation installation
    78  * Fix outdated comment references to lilv_uri_to_path()
    89
    9  -- David Robillard <d@drobilla.net>  Thu, 29 Oct 2015 00:23:04 -0400
     10 -- David Robillard <d@drobilla.net>  Thu, 29 Oct 2015 00:41:34 -0400
    1011
    1112lilv (0.22.0) stable;
  • src/world.c

    r32a4463 r95979c0  
    416416    // Set dynamic manifest library URI, if applicable
    417417    if (dynmanifest) {
    418         plug->dynmanifest = (LilvDynManifest*)dynmanifest;
     418        plugin->dynmanifest = (LilvDynManifest*)dynmanifest;
    419419        ++((LilvDynManifest*)dynmanifest)->refs;
    420420    }
     
    491491        const SordNode* binary   = sord_iter_get_node(binaries, SORD_OBJECT);
    492492        const uint8_t*  lib_uri  = sord_node_get_string(binary);
    493         const char*     lib_path = lilv_uri_to_path((const char*)lib_uri);
     493        char*           lib_path = lilv_file_uri_parse((const char*)lib_uri, 0);
    494494        if (!lib_path) {
    495495            LILV_ERROR("No dynamic manifest library path\n");
     
    505505                        lib_path, dlerror());
    506506            sord_iter_free(binaries);
     507            lilv_free(lib_path);
    507508            continue;
    508509        }
     
    516517            sord_iter_free(binaries);
    517518            dlclose(lib);
     519            lilv_free(lib_path);
    518520            continue;
    519521        }
     
    528530            sord_iter_free(binaries);
    529531            dlclose(lib);
     532            lilv_free(lib_path);
    530533            continue;
    531534        }
     
    574577        sord_iter_free(p);
    575578        sord_free(plugins);
     579        lilv_free(lib_path);
    576580    }
    577581    sord_iter_free(iter);
Note: See TracChangeset for help on using the changeset viewer.