aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2020-09-05 20:05:44 +0200
committerMike Pall <mike>2020-09-05 20:05:44 +0200
commit7e94e1c4f197f66c812c483c8a5b2b5aed791cd7 (patch)
tree60781bab184f5c1435f59eccfaf85104689c9ccf /src
parentff1e72acead01df7d8ed0fbb31efd32f57953618 (diff)
parent90e65514dda3994253c1e3007f63da7ace8f6b7b (diff)
downloadluajit-7e94e1c4f197f66c812c483c8a5b2b5aed791cd7.tar.gz
luajit-7e94e1c4f197f66c812c483c8a5b2b5aed791cd7.tar.bz2
luajit-7e94e1c4f197f66c812c483c8a5b2b5aed791cd7.zip
Merge branch 'master' into v2.1
Diffstat (limited to '')
-rw-r--r--src/lib_package.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib_package.c b/src/lib_package.c
index 5d8eb25d..b6917121 100644
--- a/src/lib_package.c
+++ b/src/lib_package.c
@@ -237,7 +237,12 @@ static const char *mksymname(lua_State *L, const char *modname,
237 237
238static int ll_loadfunc(lua_State *L, const char *path, const char *name, int r) 238static int ll_loadfunc(lua_State *L, const char *path, const char *name, int r)
239{ 239{
240 void **reg = ll_register(L, path); 240 void **reg;
241 if (strlen(path) >= 4096) {
242 lua_pushliteral(L, "path too long");
243 return PACKAGE_ERR_LIB;
244 }
245 reg = ll_register(L, path);
241 if (*reg == NULL) *reg = ll_load(L, path, (*name == '*')); 246 if (*reg == NULL) *reg = ll_load(L, path, (*name == '*'));
242 if (*reg == NULL) { 247 if (*reg == NULL) {
243 return PACKAGE_ERR_LIB; /* Unable to load library. */ 248 return PACKAGE_ERR_LIB; /* Unable to load library. */