marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix race in IMAPIProp_Release(), -W fixes.

oldstable
Jon Griffiths 2005-02-22 14:51:03 +00:00 committed by Alexandre Julliard
parent 3d9ba61478
commit 69e7d31cec
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/mapi32/prop.c
View File

@ -795,7 +795,8 @@ SCODE WINAPI ScCopyProps(int cValues, LPSPropValue lpProps, LPVOID lpDst, ULONG
{ {
LPSPropValue lpDest = (LPSPropValue)lpDst; LPSPropValue lpDest = (LPSPropValue)lpDst;
char *lpDataDest = (char *)(lpDest + cValues); char *lpDataDest = (char *)(lpDest + cValues);
ULONG ulLen, i, iter; ULONG ulLen, i;
int iter;
TRACE("(%d,%p,%p,%p)\n", cValues, lpProps, lpDst, lpCount); TRACE("(%d,%p,%p,%p)\n", cValues, lpProps, lpDst, lpCount);
@ -930,7 +931,8 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld,
static const BOOL bBadPtr = TRUE; /* Windows bug - Assumes source is bad */ static const BOOL bBadPtr = TRUE; /* Windows bug - Assumes source is bad */
LPSPropValue lpDest = (LPSPropValue)lpProps; LPSPropValue lpDest = (LPSPropValue)lpProps;
ULONG ulCount = cValues * sizeof(SPropValue); ULONG ulCount = cValues * sizeof(SPropValue);
ULONG ulLen, i, iter; ULONG ulLen, i;
int iter;
TRACE("(%d,%p,%p,%p,%p)\n", cValues, lpProps, lpOld, lpNew, lpCount); TRACE("(%d,%p,%p,%p,%p)\n", cValues, lpProps, lpOld, lpNew, lpCount);
@ -1520,7 +1522,7 @@ static inline ULONG WINAPI IMAPIProp_fnAddRef(LPMAPIPROP iface)
{ {
IPropDataImpl *This = (IPropDataImpl*)iface; IPropDataImpl *This = (IPropDataImpl*)iface;
TRACE("(%p)->(count=%ld)\n", This, This->lRef); TRACE("(%p)->(count before=%lu)\n", This, This->lRef);
return InterlockedIncrement(&This->lRef); return InterlockedIncrement(&This->lRef);
} }
@ -1534,10 +1536,12 @@ static inline ULONG WINAPI IMAPIProp_fnAddRef(LPMAPIPROP iface)
static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface) static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface)
{ {
IPropDataImpl *This = (IPropDataImpl*)iface; IPropDataImpl *This = (IPropDataImpl*)iface;
LONG lRef;
TRACE("(%p)->()\n", This); TRACE("(%p)->(count before=%lu)\n", This, This->lRef);
if (!InterlockedDecrement(&This->lRef)) lRef = InterlockedDecrement(&This->lRef);
if (!lRef)
{ {
TRACE("Destroying IPropData (%p)\n",This); TRACE("Destroying IPropData (%p)\n",This);
@ -1552,9 +1556,8 @@ static inline ULONG WINAPI IMAPIProp_fnRelease(LPMAPIPROP iface)
} }
RtlDeleteCriticalSection(&This->cs); RtlDeleteCriticalSection(&This->cs);
This->lpFree(This); This->lpFree(This);
return 0U;
} }
return (ULONG)This->lRef; return (ULONG)lRef;
} }
/************************************************************************** /**************************************************************************