shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-17 06:04:23 +03:00
Code Releases Activity

o Add error checking in _new_chunk

Browse Source
This commit is contained in:
Joe Thornber 2001-12-12 14:54:24 +00:00
parent 2fbe588881
commit c155eb83c2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/mm/pool-fast.c
View File

@ -83,6 +83,10 @@ void *pool_alloc_aligned(struct pool *p, size_t s, unsigned alignment)
int needed = s + alignment + sizeof(struct chunk);
c = _new_chunk(p, (needed > p->chunk_size) ?
needed : p->chunk_size);
if (!c)
return NULL;
_align_chunk(c, alignment);
}
@ -141,6 +145,10 @@ void *pool_begin_object(struct pool *p, size_t init_size)
init_size > (p->chunk_size - sizeof(struct chunk)) ?
init_size + sizeof(struct chunk) + align :
p->chunk_size);
if (!c)
return NULL;
_align_chunk(c, align);
}
@ -149,14 +157,17 @@ void *pool_begin_object(struct pool *p, size_t init_size)
void *pool_grow_object(struct pool *p, unsigned char *buffer, size_t n)
{
struct chunk *c = p->chunk;
struct chunk *c = p->chunk, *nc;
if (c->end - (c->begin + p->object_len) < n) {
/* move into a new chunk */
if (p->object_len + n > (p->chunk_size / 2))
_new_chunk(p, (p->object_len + n) * 2);
nc = _new_chunk(p, (p->object_len + n) * 2);
else
_new_chunk(p, p->chunk_size);
nc = _new_chunk(p, p->chunk_size);
if (!nc)
return NULL;
_align_chunk(p->chunk, p->object_alignment);
memcpy(p->chunk->begin, c->begin, p->object_len);
@ -209,7 +220,9 @@ struct chunk *_new_chunk(struct pool *p, size_t s)
c = p->spare_chunk;
p->spare_chunk = 0;
} else {
c = dbg_malloc(s);
if (!(c = dbg_malloc(s)))
return NULL;
c->end = (char *) c + s;
}