tdc: clean up minor memory errors - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit ab937b56dec51e002ef2e248a3bf9b183f848cc2
DIR parent eb1392208cead07e9e413b5ad4dbd82069d87c30
HTML Author: Russ Cox <rsc@swtch.com>
Date: Sat, 6 Dec 2008 15:35:55 -0800
dc: clean up minor memory errors
Diffstat:
M src/cmd/dc.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
DIR diff --git a/src/cmd/dc.c b/src/cmd/dc.c
t@@ -2103,14 +2103,13 @@ copy(Blk *hptr, int size)
if(size > maxsize)
maxsize = size;
sz = length(hptr);
- ptr = nalloc(hptr->beg, size);
+ ptr = malloc(size);
if(ptr == 0) {
- garbage("copy");
- if((ptr = nalloc(hptr->beg, size)) == 0) {
- Bprint(&bout,"copy size %d\n",size);
- ospace("copy");
- }
+ Bprint(&bout,"copy size %d\n",size);
+ ospace("copy");
}
+ memmove(ptr, hptr->beg, sz);
+ memset(ptr+sz, 0, size-sz);
if((hdr = hfree) == 0)
hdr = morehd();
hfree = (Blk *)hdr->rd;