arif/maui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patch valgrind issue in MResCheckJAccess

Browse Source 
git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@23 3f5042e3-fb1d-0410-be18-d6ca2573e517
This commit is contained in:
dev 2005-09-01 14:54:51 +00:00
parent ccb1c753e7
commit 93dcada570
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/msched-version.h
View File

@ -1 +1 @@
#define MSCHED_VERSION "maui-3.2.6p14-snap.1125503657"
#define MSCHED_VERSION "maui-3.2.6p14-snap.1125509278"

30
src/moab/MRes.c
View File

@ -4312,16 +4312,19 @@ int MResCheckJAccess(
}
} /* END for (aindex) */
if (J->Cred.CL[aindex].Type == maNONE)
if (aindex < MAX_MACL)
{
/* create new time CL */
if (J->Cred.CL[aindex].Type == maNONE)
{
/* create new time CL */
J->Cred.CL[aindex].Type = maDuration;
J->Cred.CL[aindex].Value = Overlap;
J->Cred.CL[aindex].Cmp = mcmpEQ;
J->Cred.CL[aindex].Affinity = nmPositiveAffinity;
J->Cred.CL[aindex].Type = maDuration;
J->Cred.CL[aindex].Value = Overlap;
J->Cred.CL[aindex].Cmp = mcmpEQ;
J->Cred.CL[aindex].Affinity = nmPositiveAffinity;
OTime = -1;
OTime = -1;
}
}
/* NOTE: res wrappers gain access if R(job) is inclusive on J(res) */
@ -4331,12 +4334,15 @@ int MResCheckJAccess(
else
MACLCheckAccess(R->ACL,J->Cred.CL,Affinity,&IsInclusive);
/* restore time CL */
if (aindex < MAX_MACL)
{
/* restore time CL */
if (OTime == -1)
J->Cred.CL[aindex].Type = maNONE;
else
J->Cred.CL[aindex].Value = OTime;
if (OTime == -1)
J->Cred.CL[aindex].Type = maNONE;
else
J->Cred.CL[aindex].Value = OTime;
}
} /* END if ((R->ExpireTime <= 0) || (R->ExpireTime == MAX_MTIME)) */
return(IsInclusive);