[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - fpicker/source

[Caolán McNamara]

 fpicker/source/office/iodlg.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 543822b6b661ebbffad9339b5395ea810ba75de2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon May 30 15:35:47 2016 +0100

    valgrind: Invalid read of size 8
    
    saw this in passing checking something else
    
    ==12972==    at 0x6DEF40B0: rtl::Reference<PlacesListBox>::get() const (ref.hxx:169)
    ==12972==    by 0x6DEEF221: VclPtr<PlacesListBox>::operator bool() const (vclptr.hxx:189)
    ==12972==    by 0x6DEED3DA: CustomContainer::GetFocus() (iodlg.cxx:429)
    ==12972==    by 0xD9EC83B: vcl::Window::CompatGetFocus() (window.cxx:3734)
    ==12972==    by 0xD93A604: vcl::Window::ImplGrabFocus(GetFocusFlags) (mouse.cxx:383)
    
    ...
    
    ==12972==  Address 0x2e4b4690 is 288 bytes inside a block of size 424 free'd
    ==12972==    at 0x4C2D22A: operator delete(void*) (vg_replace_malloc.c:576)
    ==12972==    by 0x6DED9F14: SvtFileDialog::dispose() (iodlg.cxx:518)
    ==12972==    by 0xDB04B1F: OutputDevice::disposeOnce() (outdev.cxx:161)
    ==12972==    by 0x6DED1954: VclPtr<SvtFileDialog_Base>::disposeAndClear() (vclptr.hxx:208)
    
    Change-Id: I702eab8dbcf07885e4a3415ace6706c25854174e
    (cherry picked from commit 5b342e10cbec2487085216346c055875a8eb9657)

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 26790b9..d658e92 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -516,6 +516,7 @@ void SvtFileDialog::dispose()
     }
 
     delete _pImp;
+    _pImp = nullptr;
     _pFileView.disposeAndClear();
     _pSplitter.disposeAndClear();
     _pContainer.disposeAndClear();