Module Name:    src
Committed By:   snj
Date:           Sun Jul 23 06:03:30 UTC 2017

Modified Files:
        src/sys/modules/lua [netbsd-7]: lua.c

Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #1423):
        sys/modules/lua/lua.c: revision 1.23
always put the module on the stack


To generate a diff of this commit:
cvs rdiff -u -r1.13.2.5 -r1.13.2.6 src/sys/modules/lua/lua.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/modules/lua/lua.c
diff -u src/sys/modules/lua/lua.c:1.13.2.5 src/sys/modules/lua/lua.c:1.13.2.6
--- src/sys/modules/lua/lua.c:1.13.2.5	Sun Jul 23 06:00:39 2017
+++ src/sys/modules/lua/lua.c	Sun Jul 23 06:03:30 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: lua.c,v 1.13.2.5 2017/07/23 06:00:39 snj Exp $ */
+/*	$NetBSD: lua.c,v 1.13.2.6 2017/07/23 06:03:30 snj Exp $ */
 
 /*
  * Copyright (c) 2011 - 2017 by Marc Balmer <mbal...@netbsd.org>.
@@ -513,16 +513,16 @@ lua_require(lua_State *L)
 	if (md != NULL)
 		LIST_FOREACH(s, &lua_states, lua_next)
 			if (s->K->L == L) {
-				LIST_FOREACH(m, &s->lua_modules, mod_next)
-					if (m == md)
-						return 1;
-
 				if (lua_verbose)
 					device_printf(sc_self,
 					    "require module %s\n",
 					    md->mod_name);
 				luaL_requiref(L, md->mod_name, md->open, 0);
 
+				LIST_FOREACH(m, &s->lua_modules, mod_next)
+					if (m == md)
+						return 1;
+
 				md->refcount++;
 				LIST_INSERT_HEAD(&s->lua_modules, md, mod_next);
 				return 1;

Reply via email to