commit - 34e8254fb8cc206664fc9dcba3c7c8ae1de6ab85
commit + 725d9fd7952a63c09f50d5544d0b306177462d43
blob - 5d409a98d6db05e5852f37c0defd910350342c4e
blob + 2f015febab62b966ee13577d0c44e2772e2dfde9
--- src/cmd/acme/wind.c
+++ src/cmd/acme/wind.c
int i;
File *f;
-//fprint(2, "winlock %p %d %lux\n", w, owner, getcallerpc(&w));
f = w->body.file;
for(i=0; i<f->ntext; i++)
winlock1(f->text[i]->w, owner);
int i;
File *f;
-//fprint(2, "winunlock %p %lux\n", w, getcallerpc(&w));
+ /*
+ * subtle: loop runs backwards to avoid tripping over
+ * winclose indirectly editing f->text and freeing f
+ * on the last iteration of the loop.
+ */
f = w->body.file;
- for(i=0; i<f->ntext; i++){
+ for(i=f->ntext-1; i>=0; i--){
w = f->text[i]->w;
w->owner = 0;
qunlock(&w->lk);
winclose(w);
- /* winclose() can change up f->text; beware */
- if(f->ntext>0 && w != f->text[i]->w)
- --i; /* winclose() deleted window */
}
}