From 91450a968df15b6134ab2cef49e5f4a3679735c8 Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Wed, 31 Mar 2010 22:28:10 -0400 Subject: [PATCH] Set a storeOps storeproc for the memcache case Finish fixing the bug from 34ffc9cd that 57d8e454 only partially fixed -- set a storeOps.storeproc element in rxfs_storeMemOps as well as in rxfs_storeOps. This eliminates a NULL/uninitialized memory dereference. Change-Id: I9fe0fb147222b8f7a5a76c9ada9ca93f53ce1fa7 Reviewed-on: http://gerrit.openafs.org/1677 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/afs/afs_fetchstore.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/afs/afs_fetchstore.c b/src/afs/afs_fetchstore.c index 048c0c2..a970027 100644 --- a/src/afs/afs_fetchstore.c +++ b/src/afs/afs_fetchstore.c @@ -349,7 +349,8 @@ struct storeOps rxfs_storeMemOps = { rxfs_storeStatus, rxfs_storePadd, rxfs_storeClose, - rxfs_storeDestroy + rxfs_storeDestroy, + afs_GenericStoreProc #else .prepare = rxfs_storeMemPrepare, .read = rxfs_storeMemRead, @@ -357,7 +358,12 @@ struct storeOps rxfs_storeMemOps = { .status = rxfs_storeStatus, .padd = rxfs_storePadd, .close = rxfs_storeClose, - .destroy = rxfs_storeDestroy + .destroy = rxfs_storeDestroy, +#ifdef AFS_LINUX26_ENV + .storeproc = afs_linux_storeproc +#else + .storeproc = afs_GenericStoreProc +#endif #endif }; -- 1.9.4