From 454af39fbc6e1cc9457ad09c3d50771255dfa1ba Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sat, 8 Feb 2003 07:38:39 +0000 Subject: [PATCH] vol-check-malloc-return-20030208 make sure malloc doesn't fail in vol package either --- src/vol/clone.c | 4 ++++ src/vol/vnode.c | 1 + src/vol/volume.c | 1 + 3 files changed, 6 insertions(+) diff --git a/src/vol/clone.c b/src/vol/clone.c index 00115595f..fdaac8e87 100644 --- a/src/vol/clone.c +++ b/src/vol/clone.c @@ -94,6 +94,10 @@ struct clone_head *ah; { /* if no last elt (first call) or last item full, get a new one */ if ((!ah->last) || ah->last->nitems >= CLONE_MAXITEMS) { ti = (struct clone_items *) malloc(sizeof(struct clone_items)); + if (!ti) { + Log("ci_AddItem: malloc failed\n"); + assert(0); + } ti->nitems = 0; ti->next = (struct clone_items *) 0; if (ah->last) { diff --git a/src/vol/vnode.c b/src/vol/vnode.c index ee3e663b3..0e7eb7924 100644 --- a/src/vol/vnode.c +++ b/src/vol/vnode.c @@ -392,6 +392,7 @@ Vnode *VAllocVnode_r(ec,vp,type) } else { /* growing file - grow in a reasonable increment */ char *buf = (char *)malloc(16*1024); + if (!buf) Abort("VAllocVnode: malloc failed\n"); memset(buf, 0, 16*1024); FDH_WRITE(fdP, buf, 16*1024); free(buf); diff --git a/src/vol/volume.c b/src/vol/volume.c index 9f825bfdd..709ced5de 100644 --- a/src/vol/volume.c +++ b/src/vol/volume.c @@ -1719,6 +1719,7 @@ void VAddToVolumeUpdateList_r(Error *ec, Volume *vp) UpdateList = (VolumeId *) realloc(UpdateList, sizeof (VolumeId) * updateSize); } } + assert(UpdateList != NULL); UpdateList[nUpdatedVolumes++] = V_id(vp); } -- 2.39.5