Merge pull request #263 from tkchia/tkchia/20220801

Fix use-after-free in Modula-2 middle-end's em_m2
This commit is contained in:
David Given 2022-08-01 22:34:57 +02:00 committed by GitHub
commit d728801f43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -112,10 +112,11 @@ static void chk_forw(struct def **pdf)
register struct def *df;
while ( (df = *pdf) ) {
if (df->df_kind == D_FORWTYPE) {
pdf = &df->df_nextinscope;
while (df->df_kind == D_FORWTYPE) {
register struct def *df2 = df->df_nextinscope;
pdf = NULL;
ForceForwardTypeDef(df); /* removes df */
continue;
df = df2;
}
if (df->df_kind & (D_FORWARD|D_FORWMODULE)) {
/* These definitions must be found in
@ -138,7 +139,8 @@ df->df_idf->id_text);
nextvisible(CurrVis);
register struct def *df1 = lookup(df->df_idf, ls->sc_scope, 0, 0);
*pdf = df->df_nextinscope;
if (pdf)
*pdf = df->df_nextinscope;
if (! df1) {
if (df->df_kind == D_FORWMODULE) {