[Libreoffice-commits] core.git: vcl/generic

Khaled Hosny khaledhosny at eglug.org
Mon Apr 29 13:23:31 PDT 2013


 vcl/generic/glyphs/gcach_layout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3719396649c8c944727f89c517a8191cd37b2499
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Mon Apr 29 22:13:44 2013 +0200

    [harfbuzz] Don't crash when closing LibreOffice
    
    We shouldn't be trying to free the font table buffer when destroying the
    blob, so pass NULL for destroy function instead of free(), and also use
    HB_MEMORY_MODE_READONLY just to be safe.
    
    Change-Id: I85b5a575249b4efc0f5799db205ee17cbeb66d22

diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index abd1ab8..5fea884 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -220,7 +220,7 @@ static hb_blob_t *getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pU
 
     hb_blob_t* pBlob = NULL;
     if (pBuffer != NULL)
-        pBlob = hb_blob_create((const char*) pBuffer, nLength, HB_MEMORY_MODE_WRITABLE, (void*) pBuffer, free);
+        pBlob = hb_blob_create((const char*) pBuffer, nLength, HB_MEMORY_MODE_READONLY, (void*) pBuffer, NULL);
 
     return pBlob;
 }


More information about the Libreoffice-commits mailing list