Merge branch 'v2.1' into temp-v3bp-syntax1temp-v3bp-syntax1

1 files changed, 1 insertions, 1 deletions

diff --git a/src/lj_profile.c b/src/lj_profile.c
index 5b2a2b6c7..ea65fcb8f 100644
--- a/src/lj_profile.c
+++ b/src/lj_profile.c
@@ -359,6 +359,7 @@ LUA_API void luaJIT_profile_stop(lua_State *L)
   ProfileState *ps = &profile_state;
   global_State *g = ps->g;
   if (G(L) == g) {  /* Only stop profiler if started by this VM. */
+    ps->g = NULL;
     profile_timer_stop(ps);
     g->hookmask &= ~HOOK_PROFILE;
     lj_dispatch_update(g, 0);
@@ -368,7 +369,6 @@ LUA_API void luaJIT_profile_stop(lua_State *L)
 #endif
     lj_buf_free(g, &ps->sb);
     ps->sb.w = ps->sb.e = NULL;
-    ps->g = NULL;
   }
 }