strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: rhbz#668109 ne_simple_propfind can touch gcrypt as well

Browse source
This commit is contained in:
Caolán McNamara 2010-12-09 20:32:23 +00:00
parent 16163cb3d8
commit 85c2c9a5a2
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ucb/source/ucp/webdav/NeonPropFindRequest.cxx
View file

@ -260,6 +260,8 @@ extern "C" void NPFR_propnames_results( void* userdata,
theResources->push_back( theResource ); theResources->push_back( theResource );
} }
extern osl::Mutex aGlobalNeonMutex;
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Constructor // Constructor
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -287,12 +289,15 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
thePropNames[ theIndex ].nspace = NULL; thePropNames[ theIndex ].nspace = NULL;
thePropNames[ theIndex ].name = NULL; thePropNames[ theIndex ].name = NULL;
nError = ne_simple_propfind( inSession, {
inPath, osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
inDepth, nError = ne_simple_propfind( inSession,
thePropNames, inPath,
NPFR_propfind_results, inDepth,
&ioResources ); thePropNames,
NPFR_propfind_results,
&ioResources );
}
for ( theIndex = 0; theIndex < thePropCount; theIndex ++ ) for ( theIndex = 0; theIndex < thePropCount; theIndex ++ )
free( (void *)thePropNames[ theIndex ].name ); free( (void *)thePropNames[ theIndex ].name );
@ -302,6 +307,7 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
else else
{ {
// ALLPROP // ALLPROP
osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
nError = ne_simple_propfind( inSession, nError = ne_simple_propfind( inSession,
inPath, inPath,
inDepth, inDepth,