From: Derrick Brashear Date: Mon, 31 Jul 2006 16:19:36 +0000 (+0000) Subject: DEVEL15-call-bzero-in-convertvolumeinfo-with-correct-size-for-dotreadonly-20060731 X-Git-Tag: openafs-devel-1_5_5~24 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e53b71c3de11718039a148c09ee50ade500ed1ac;p=packages%2Fo%2Fopenafs.git DEVEL15-call-bzero-in-convertvolumeinfo-with-correct-size-for-dotreadonly-20060731 FIXES 36442 and slipstream in bzero() killing (cherry picked from commit 8d2dbc51f40e61cbe6157c910dff18606cf84282) --- diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c index a963cbada..8cda06e0a 100644 --- a/src/vol/namei_ops.c +++ b/src/vol/namei_ops.c @@ -1470,7 +1470,7 @@ convertVolumeInfo(fdr, fdw, vid) * the old RW volume around */ p = strrchr(vd.name, '.'); if (p && !strcmp(p, ".readonly")) { - bzero(p, 8); + memset(p, 0, 9); } if (write(fdw, &vd, sizeof(struct VolumeDiskData)) != sizeof(struct VolumeDiskData)) { @@ -1584,7 +1584,7 @@ namei_ConvertROtoRWvolume(IHandle_t * h, afs_uint32 vid) * proceed. */ - bzero(&t_ih, sizeof(t_ih)); + memset(&t_ih, 0, sizeof(t_ih)); t_ih.ih_dev = h->ih_dev; t_ih.ih_vid = h->ih_vid;