[Libreoffice-commits] .: Branch 'libreoffice-3-3' - ucb/source
David Tardon
dtardon at kemper.freedesktop.org
Tue Dec 14 03:51:17 PST 2010
ucb/source/ucp/webdav/NeonPropFindRequest.cxx | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 39f5301bdfa200b092da69718c84d19acaac0791
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 9 20:32:23 2010 +0000
Resolves: rhbz#661809 ne_simple_propfind can touch gcrypt as well
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
index 3946eb0..dc5ed6d 100644
--- a/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav/NeonPropFindRequest.cxx
@@ -260,6 +260,8 @@ extern "C" void NPFR_propnames_results( void* userdata,
theResources->push_back( theResource );
}
+extern osl::Mutex aGlobalNeonMutex;
+
// -------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------
@@ -287,12 +289,15 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
thePropNames[ theIndex ].nspace = NULL;
thePropNames[ theIndex ].name = NULL;
- nError = ne_simple_propfind( inSession,
- inPath,
- inDepth,
- thePropNames,
- NPFR_propfind_results,
- &ioResources );
+ {
+ osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
+ nError = ne_simple_propfind( inSession,
+ inPath,
+ inDepth,
+ thePropNames,
+ NPFR_propfind_results,
+ &ioResources );
+ }
for ( theIndex = 0; theIndex < thePropCount; theIndex ++ )
free( (void *)thePropNames[ theIndex ].name );
@@ -302,6 +307,7 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
else
{
// ALLPROP
+ osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex );
nError = ne_simple_propfind( inSession,
inPath,
inDepth,
More information about the Libreoffice-commits
mailing list