[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/webdav-locking.diff |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d6be25dbc432713dd29153d61acec2723c19385d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Dec 10 02:21:51 2009 +0200

    Fix a problem in WebDAV code
    
    Small change that seems to fix bnc#553819. Use the local xResAccess
    variable instead of the member m_xResAccess in one more place inside
    Content::open(), like in other places. This avoids a crash caused by
    heap corruption, valgrind reports access to freed data. Unfortunately
    I was not able to wrap my head around the code enough to understand
    the exact mecahism which causes that, though. But as long as this
    fixes the crash, I am satisfied.

diff --git a/patches/dev300/webdav-locking.diff b/patches/dev300/webdav-locking.diff
index 6d6599b..6e81ff0 100644
--- a/patches/dev300/webdav-locking.diff
+++ b/patches/dev300/webdav-locking.diff
@@ -2190,7 +2190,7 @@
 -                    uno::Reference< io::XInputStream > xIn
 -                        = xResAccess->GET( aHeaders, aResource, xEnv );
 +                    try {
-+                        m_xResAccess->LOCK( *m_pLock, xEnv );
++                        xResAccess->LOCK( *m_pLock, xEnv );
 +                        m_xLockEnv = xEnv;
 +                    }
 +                    catch ( ucb::CommandFailedException const &e )