diff --git a/src/linker.c b/src/linker.c index 365480b0..c983832c 100644 --- a/src/linker.c +++ b/src/linker.c @@ -138,10 +138,20 @@ static jv jv_basename(jv name) { // Asummes validated relative path to module static jv find_lib(jq_state *jq, jv rel_path, jv search, const char *suffix, jv jq_origin, jv lib_origin) { - if (jv_get_kind(search) != JV_KIND_ARRAY) - return jv_invalid_with_msg(jv_string_fmt("Module search path must be an array")); - if (jv_get_kind(rel_path) != JV_KIND_STRING) + if (!jv_is_valid(rel_path)) { + jv_free(search); + return rel_path; + } + if (jv_get_kind(rel_path) != JV_KIND_STRING) { + jv_free(rel_path); + jv_free(search); return jv_invalid_with_msg(jv_string_fmt("Module path must be a string")); + } + if (jv_get_kind(search) != JV_KIND_ARRAY) { + jv_free(rel_path); + jv_free(search); + return jv_invalid_with_msg(jv_string_fmt("Module search path must be an array")); + } struct stat st; int ret;