Framework improvements

* Fixed invalid access to missing built-in resources.
* Fixed some command line options that caused JACK version to crash.

Author: sadko4u

CHANGELOG

@@ -3,6 +3,8 @@
 *******************************************************************************
 
 === 1.0.28 ===
+* Fixed invalid access to missing built-in resources.
+* Fixed some command line options that caused JACK version to crash.
 * Updated build scripts.
 
 === 1.0.27 ===

src/main/resource/BuiltinLoader.cpp

@@ -168,11 +168,11 @@ namespace lsp
                 // Find entry and check that it is of directory type
                 status_t res = find_entry(&index, path);
                 if (res != STATUS_OK)
-                    return res;
+                    return -set_error(res);
 
                 ent = &pCatalog[index];
                 if (ent->type != RES_DIR)
-                    return STATUS_NOT_DIRECTORY;
+                    return -set_error(STATUS_NOT_DIRECTORY);
             }
 
             // Now create list of nested items
@@ -184,7 +184,7 @@ namespace lsp
 
                 resource_t *item = xlist.add();
                 if (item == NULL)
-                    return STATUS_NO_MEM;
+                    return -set_error(STATUS_NO_MEM);
 
                 strncpy(item->name, ent->name, RESOURCE_NAME_MAX);
                 item->name[RESOURCE_NAME_MAX - 1] = '\0';
@@ -194,6 +194,8 @@ namespace lsp
             // Return result
             index = xlist.size();
             *list = xlist.release();
+
+            set_error(STATUS_OK);
             return index;
         }
     } /* namespace resource */

src/main/resource/DirLoader.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <[email protected]>
+ * Copyright (C) 2025 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2025 Vladimir Sadovnikov <[email protected]>
  *
  * This file is part of lsp-runtime-lib
  * Created on: 23 окт. 2020 г.
@@ -87,9 +87,10 @@ namespace lsp
             io::Path tmp;
             nError  = build_path(&tmp, path);
 
-            return (nError == STATUS_OK) ? ILoader::enumerate(&tmp, list) : -nError;
+            return (nError == STATUS_OK) ? ILoader::enumerate(&tmp, list) : -set_error(nError);
         }
-    }
-}
+
+    } /* namespace resource */
+} /* namespace lsp */
 
 

src/main/resource/ILoader.cpp

@@ -139,14 +139,16 @@ namespace lsp
 
         ssize_t ILoader::enumerate(const io::Path *path, resource_t **list)
         {
+            lsp_trace("path = %s", path->as_utf8());
+
             lltl::darray<resource_t> xlist;
             io::Dir dir;
             LSPString item;
             io::fattr_t attr;
 
             status_t res = dir.open(path);
             if (res != STATUS_OK)
-                return -res;
+                return -set_error(res);
 
             while ((res = dir.reads(&item, &attr)) == STATUS_OK)
             {
@@ -160,13 +162,13 @@ namespace lsp
                 if (r == NULL)
                 {
                     dir.close();
-                    return -STATUS_NO_MEM;
+                    return -set_error(STATUS_NO_MEM);
                 }
                 const char *name = item.get_utf8();
                 if (name == NULL)
                 {
                     dir.close();
-                    return -STATUS_NO_MEM;
+                    return -set_error(STATUS_NO_MEM);
                 }
 
                 r->type = (attr.type == io::fattr_t::FT_DIRECTORY) ? RES_DIR : RES_FILE;
@@ -177,15 +179,18 @@ namespace lsp
             if (res != STATUS_EOF)
             {
                 dir.close();
-                return -res;
+                return -set_error(res);
             }
             else if ((res = dir.close()) != STATUS_OK)
-                return -res;
+                return -set_error(res);
 
             // Detach data pointer from the collection and return as result
             const ssize_t return_size = xlist.size();
             *list       = xlist.release();
 
+            lsp_trace("return %d resources %p", int(return_size), *list);
+
+            set_error(STATUS_OK);
             return return_size;
         }
 

src/main/resource/PrefixLoader.cpp

@@ -303,6 +303,7 @@ namespace lsp
 
         ssize_t PrefixLoader::enumerate(const char *path, resource::resource_t **list)
         {
+            lsp_trace("path = %s", path);
             LSPString tmp;
             ILoader *ldr = lookup_prefix(&tmp, path);
             if (ldr != NULL)
@@ -317,6 +318,7 @@ namespace lsp
 
         ssize_t PrefixLoader::enumerate(const LSPString *path, resource::resource_t **list)
         {
+            lsp_trace("path = %s", path->get_utf8());
             LSPString tmp;
             ILoader *ldr = lookup_prefix(&tmp, path);
             if (ldr != NULL)