diff options
| author | Xin LI <delphij@FreeBSD.org> | 2009-04-02 17:16:39 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2009-04-02 17:16:39 +0000 |
| commit | 06f535757cd420eedcb1ec7796ff26e5fc10a30f (patch) | |
| tree | d34266bb7db568ee25a9108728901a9a50d1bab0 /lib | |
| parent | 42e607776b9d5bc517dcedd6aedbd2416f1a0474 (diff) | |
| download | src-06f535757cd420eedcb1ec7796ff26e5fc10a30f.tar.gz src-06f535757cd420eedcb1ec7796ff26e5fc10a30f.zip | |
Bail out when memory allocation is failed, rather than referencing
a NULL pointer.
PR: kern/94480
Submitted by: Michiel Pelt <m.pelt xs4all nl>
Notes
Notes:
svn path=/head/; revision=190646
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libufs/block.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libufs/block.c b/lib/libufs/block.c index 5450a5d57739..212cdc66daa2 100644 --- a/lib/libufs/block.c +++ b/lib/libufs/block.c @@ -64,8 +64,10 @@ bread(struct uufsd *disk, ufs2_daddr_t blockno, void *data, size_t size) */ if (((intptr_t)data) & 0x3f) { p2 = malloc(size); - if (p2 == NULL) + if (p2 == NULL) { ERROR(disk, "allocate bounce buffer"); + goto fail; + } } cnt = pread(disk->d_fd, p2, size, (off_t)(blockno * disk->d_bsize)); if (cnt == -1) { @@ -115,8 +117,10 @@ bwrite(struct uufsd *disk, ufs2_daddr_t blockno, const void *data, size_t size) */ if (((intptr_t)data) & 0x3f) { p2 = malloc(size); - if (p2 == NULL) + if (p2 == NULL) { ERROR(disk, "allocate bounce buffer"); + return (-1); + } memcpy(p2, data, size); data = p2; } |