xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

acid/leak: fix endless loop for B2NB(b) == b case (thanks mischief)

Browse source
This commit is contained in:
cinap_lenrek 2015-10-19 00:20:33 +02:00
parent 5ca4afb249
commit 24d74a4b5f
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/lib/acid/leak
View file

@ -41,8 +41,7 @@ dumparena(arena, sum)
if nb == b then { if nb == b then {
print("B2NB(", b\A, ") = b\n"); print("B2NB(", b\A, ") = b\n");
b = atail; // end loop b = atail; // end loop
} } else if nb > atail then {
if nb > atail then {
b = (Bhdr)(b+4); b = (Bhdr)(b+4);
print("lost at block ", (b-4)\A, ", scanning forward\n"); print("lost at block ", (b-4)\A, ", scanning forward\n");
while b < atail && b.magic != ALLOC_MAGIC && b.magic != FREE_MAGIC do while b < atail && b.magic != ALLOC_MAGIC && b.magic != FREE_MAGIC do

9
sys/lib/acid/pool
View file

@ -206,18 +206,19 @@ checkblock(addr)
defn defn
checkarena(arena) checkarena(arena)
{ {
local atail, b; local atail, b, nb;
atail = A2TB(arena); atail = A2TB(arena);
complex Bhdr arena; complex Bhdr arena;
b = arena; b = arena;
while b.magic != ARENATAIL_MAGIC && b < atail do { while b.magic != ARENATAIL_MAGIC && b < atail do {
checkblock(b); checkblock(b);
if B2NB(b) == b then { nb = B2NB(b);
if nb == b then {
print("B2NB(", b\X, ") = b\n"); print("B2NB(", b\X, ") = b\n");
b = atail; // end loop b = atail; // end loop
} } else
b = B2NB(b); b = nb;
} }
checkblock(b); checkblock(b);