From: Mike Pall <mike>
Date: Tue, 7 Nov 2023 21:28:53 +0000 (+0100)
Subject: Merge branch 'master' into v2.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b94fbfbee9e7dd0979e35aacea7fcdd43905789b;p=thirdparty%2FLuaJIT.git

Merge branch 'master' into v2.1
---

b94fbfbee9e7dd0979e35aacea7fcdd43905789b
diff --cc src/lj_cparse.c
index 6c3bb2f9,2ef7dbe1..9774f3a5
--- a/src/lj_cparse.c
+++ b/src/lj_cparse.c
@@@ -1765,12 -1746,14 +1765,14 @@@ static void cp_pragma(CPState *cp, BCLi
      cp_next(cp);
      cp_check(cp, '(');
      if (cp->tok == CTOK_IDENT) {
 -      if (cp->str->hash == H_(738e923c,a1b65954)) {  /* push */
 +      if (cp_str_is(cp->str, "push")) {
- 	if (cp->curpack < CPARSE_MAX_PACKSTACK) {
+ 	if (cp->curpack < CPARSE_MAX_PACKSTACK-1) {
  	  cp->packstack[cp->curpack+1] = cp->packstack[cp->curpack];
  	  cp->curpack++;
+ 	} else {
+ 	  cp_errmsg(cp, cp->tok, LJ_ERR_XLEVELS);
  	}
 -      } else if (cp->str->hash == H_(6c71cf27,6c71cf27)) {  /* pop */
 +      } else if (cp_str_is(cp->str, "pop")) {
  	if (cp->curpack > 0) cp->curpack--;
        } else {
  	cp_errmsg(cp, cp->tok, LJ_ERR_XSYMBOL);