o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

winunlock bug

Browse source
This commit is contained in:
rsc 2005-07-28 04:47:00 +00:00
parent 34e8254fb8
commit 725d9fd795
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cmd/acme/wind.c
View file

@ -145,7 +145,6 @@ winlock(Window *w, int owner)
int i; int i;
File *f; File *f;
//fprint(2, "winlock %p %d %lux\n", w, owner, getcallerpc(&w));
f = w->body.file; f = w->body.file;
for(i=0; i<f->ntext; i++) for(i=0; i<f->ntext; i++)
winlock1(f->text[i]->w, owner); winlock1(f->text[i]->w, owner);
@ -157,16 +156,17 @@ winunlock(Window *w)
int i; int i;
File *f; 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; 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 = f->text[i]->w;
w->owner = 0; w->owner = 0;
qunlock(&w->lk); qunlock(&w->lk);
winclose(w); winclose(w);
/* winclose() can change up f->text; beware */
if(f->ntext>0 && w != f->text[i]->w)
--i; /* winclose() deleted window */
} }
} }