BUG: lua_newtag can be called before luaI_IMtable is initialized.

This commit is contained in:
Roberto Ierusalimschy
1997-03-20 17:36:19 -03:00
parent 5d60470508
commit ae067dcddd

View File

@@ -3,7 +3,7 @@
** TecCGraf - PUC-Rio ** TecCGraf - PUC-Rio
*/ */
char *rcs_fallback="$Id: fallback.c,v 1.29 1997/03/19 21:12:34 roberto Exp roberto $"; char *rcs_fallback="$Id: fallback.c,v 1.30 1997/03/20 19:20:43 roberto Exp roberto $";
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -174,6 +174,7 @@ static void init_entry (int tag)
void luaI_initfallbacks (void) void luaI_initfallbacks (void)
{ {
if (luaI_IMtable == NULL) {
int i; int i;
IMtable_size = NUM_TYPES+10; IMtable_size = NUM_TYPES+10;
luaI_IMtable = newvector(IMtable_size, struct IM); luaI_IMtable = newvector(IMtable_size, struct IM);
@@ -181,15 +182,18 @@ void luaI_initfallbacks (void)
luaI_IMtable[-i].tp = (lua_Type)i; luaI_IMtable[-i].tp = (lua_Type)i;
init_entry(i); init_entry(i);
} }
}
} }
int lua_newtag (char *t) int lua_newtag (char *t)
{ {
int tp; int tp;
--last_tag; --last_tag;
if ((-last_tag) >= IMtable_size) if ((-last_tag) >= IMtable_size) {
luaI_initfallbacks();
IMtable_size = growvector(&luaI_IMtable, IMtable_size, IMtable_size = growvector(&luaI_IMtable, IMtable_size,
struct IM, memEM, MAX_INT); struct IM, memEM, MAX_INT);
}
tp = -findstring(t, typenames); tp = -findstring(t, typenames);
if (tp == LUA_T_ARRAY || tp == LUA_T_USERDATA) if (tp == LUA_T_ARRAY || tp == LUA_T_USERDATA)
luaI_IMtable[-last_tag].tp = tp; luaI_IMtable[-last_tag].tp = tp;