comparison src/scriptfile.c @ 19075:af1eca322b9e v8.2.0098

patch 8.2.0098: exe stack length can be wrong without being detected Commit: https://github.com/vim/vim/commit/e31ee86859528a7ffe00405645547d494e522fa8 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 7 20:59:34 2020 +0100 patch 8.2.0098: exe stack length can be wrong without being detected Problem: Exe stack length can be wrong without being detected. Solution: Add a check when ABORT_ON_INTERNAL_ERROR is defined.
author Bram Moolenaar <Bram@vim.org>
date Tue, 07 Jan 2020 21:00:07 +0100
parents 5a62b4a0c961
children 44c6498535c9
comparison
equal deleted inserted replaced
19074:d7a865d2db06 19075:af1eca322b9e
1097 #endif 1097 #endif
1098 #ifdef FEAT_PROFILE 1098 #ifdef FEAT_PROFILE
1099 proftime_T wait_start; 1099 proftime_T wait_start;
1100 #endif 1100 #endif
1101 int trigger_source_post = FALSE; 1101 int trigger_source_post = FALSE;
1102 ESTACK_CHECK_DECLARATION
1102 1103
1103 p = expand_env_save(fname); 1104 p = expand_env_save(fname);
1104 if (p == NULL) 1105 if (p == NULL)
1105 return retval; 1106 return retval;
1106 fname_exp = fix_fname(p); 1107 fname_exp = fix_fname(p);
1214 cookie.level = ex_nesting_level; 1215 cookie.level = ex_nesting_level;
1215 #endif 1216 #endif
1216 1217
1217 // Keep the sourcing name/lnum, for recursive calls. 1218 // Keep the sourcing name/lnum, for recursive calls.
1218 estack_push(ETYPE_SCRIPT, fname_exp, 0); 1219 estack_push(ETYPE_SCRIPT, fname_exp, 0);
1220 ESTACK_CHECK_SETUP
1219 1221
1220 #ifdef STARTUPTIME 1222 #ifdef STARTUPTIME
1221 if (time_fd != NULL) 1223 if (time_fd != NULL)
1222 time_push(&tv_rel, &tv_start); 1224 time_push(&tv_rel, &tv_start);
1223 #endif 1225 #endif
1353 } 1355 }
1354 #endif 1356 #endif
1355 1357
1356 if (got_int) 1358 if (got_int)
1357 emsg(_(e_interr)); 1359 emsg(_(e_interr));
1360 ESTACK_CHECK_NOW
1358 estack_pop(); 1361 estack_pop();
1359 if (p_verbose > 1) 1362 if (p_verbose > 1)
1360 { 1363 {
1361 verbose_enter(); 1364 verbose_enter();
1362 smsg(_("finished sourcing %s"), fname); 1365 smsg(_("finished sourcing %s"), fname);