diff options
| -rw-r--r-- | sys/src/libbio/binit.c | 1 | ||||
| -rw-r--r-- | sys/src/libbio/brdstr.c | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/src/libbio/binit.c b/sys/src/libbio/binit.c index ef705e667..36ed50ace 100644 --- a/sys/src/libbio/binit.c +++ b/sys/src/libbio/binit.c @@ -114,6 +114,7 @@ Bopen(char *name, int mode) if(f < 0) return 0; bp = malloc(sizeof(Biobuf)); + setmalloctag(bp, getcallerpc(&name)); Binits(bp, f, mode, bp->b, sizeof(bp->b)); bp->flag = Bmagic; /* mark bp open & malloced */ return bp; diff --git a/sys/src/libbio/brdstr.c b/sys/src/libbio/brdstr.c index 0355ec3f6..5e27c033d 100644 --- a/sys/src/libbio/brdstr.c +++ b/sys/src/libbio/brdstr.c @@ -51,7 +51,8 @@ Brdstr(Biobufhdr *bp, int delim, int nulldelim) if(ep) { j = (ep - ip) + 1; bp->icount += j; - return badd(nil, &bp->rdline, ip, j, delim, nulldelim); + p = badd(nil, &bp->rdline, ip, j, delim, nulldelim); + goto out; } /* @@ -72,7 +73,7 @@ Brdstr(Biobufhdr *bp, int delim, int nulldelim) if(j < 0) Berror(bp, "read error: %r"); if(j <= 0 && i == 0) - return p; + goto out; if(j <= 0 && i > 0){ /* * end of file but no delim. pretend we got a delim @@ -100,7 +101,8 @@ Brdstr(Biobufhdr *bp, int delim, int nulldelim) } j = (ep - (char*)bp->bbuf) + 1; bp->icount = j - i; - return badd(p, &bp->rdline, ip, j, delim, nulldelim); + p = badd(p, &bp->rdline, ip, j, delim, nulldelim); + goto out; } ip += j; } @@ -113,4 +115,7 @@ Brdstr(Biobufhdr *bp, int delim, int nulldelim) bp->icount = 0; bp->gbuf = bp->ebuf; } +out: + setmalloctag(p, getcallerpc(&bp)); + return p; } |
