From 6ac4def0a86d75c2ffc49ef8319515ba4bff26cc Mon Sep 17 00:00:00 2001

From: Miklos Vajna <vmiklos@collabora.co.uk>

Date: Mon, 28 Sep 2015 09:06:10 +0200

Subject: [PATCH 163/398] libreofficekit: fix mismatched free() / delete

Change-Id: I60eb53d4bf9943fd52e0a9d8e3574a7d1cc027e0

(cherry picked from commit 0067b4df75cdbeb325024cd2b66e3d64fe8b3fcd)

---

 libreofficekit/source/gtk/lokdocview.cxx | 28 ++++++++++++++--------------

 libreofficekit/source/gtk/tilebuffer.cxx | 11 ++++++++---

 libreofficekit/source/gtk/tilebuffer.hxx |  3 +++

 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx

index 7c52ce2e2efb..6679cee56cd3 100644

--- a/libreofficekit/source/gtk/lokdocview.cxx

+++ b/libreofficekit/source/gtk/lokdocview.cxx

@@ -314,7 +314,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)

         pLOEvent->m_nKeyEvent = LOK_KEYEVENT_KEYUP;

         pLOEvent->m_nCharCode = nCharCode;

         pLOEvent->m_nKeyCode  = nKeyCode;

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

         g_object_unref(task);

     }

@@ -325,7 +325,7 @@ signalKey (GtkWidget* pWidget, GdkEventKey* pEvent)

         pLOEvent->m_nKeyEvent = LOK_KEYEVENT_KEYINPUT;

         pLOEvent->m_nCharCode = nCharCode;

         pLOEvent->m_nKeyCode  = nKeyCode;

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

         g_object_unref(task);

     }

@@ -951,7 +951,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)

                 pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_END;

                 pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(pEvent->x, priv->m_fZoom);

                 pLOEvent->m_nSetGraphicSelectionY = pixelToTwip(pEvent->y, priv->m_fZoom);

-                g_task_set_task_data(task, pLOEvent, g_free);

+                g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

                 g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

                 g_object_unref(task);

@@ -970,7 +970,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)

             pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_END;

             pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(pEvent->x, priv->m_fZoom);

             pLOEvent->m_nSetGraphicSelectionY = pixelToTwip(pEvent->y, priv->m_fZoom);

-            g_task_set_task_data(task, pLOEvent, g_free);

+            g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

             g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

             g_object_unref(task);

@@ -1019,7 +1019,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)

                     pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_START;

                     pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(priv->m_aGraphicHandleRects[i].x + priv->m_aGraphicHandleRects[i].width / 2, priv->m_fZoom);

                     pLOEvent->m_nSetGraphicSelectionY = pixelToTwip(priv->m_aGraphicHandleRects[i].y + priv->m_aGraphicHandleRects[i].height / 2, priv->m_fZoom);

-                    g_task_set_task_data(task, pLOEvent, g_free);

+                    g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

                     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

                     g_object_unref(task);

@@ -1047,7 +1047,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)

         pLOEvent->m_nPostMouseEventX = pixelToTwip(pEvent->x, priv->m_fZoom);

         pLOEvent->m_nPostMouseEventY = pixelToTwip(pEvent->y, priv->m_fZoom);

         pLOEvent->m_nPostMouseEventCount = nCount;

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

         g_object_unref(task);

@@ -1065,7 +1065,7 @@ lok_doc_view_signal_button(GtkWidget* pWidget, GdkEventButton* pEvent)

         pLOEvent->m_nPostMouseEventX = pixelToTwip(pEvent->x, priv->m_fZoom);

         pLOEvent->m_nPostMouseEventY = pixelToTwip(pEvent->y, priv->m_fZoom);

         pLOEvent->m_nPostMouseEventCount = nCount;

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

         g_object_unref(task);

@@ -1153,7 +1153,7 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)

         pLOEvent->m_nSetGraphicSelectionType = LOK_SETGRAPHICSELECTION_START;

         pLOEvent->m_nSetGraphicSelectionX = pixelToTwip(pEvent->x, priv->m_fZoom);

         pLOEvent->m_nSetGraphicSelectionY = pixelToTwip(pEvent->y, priv->m_fZoom);

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

         g_object_unref(task);

@@ -1169,7 +1169,7 @@ lok_doc_view_signal_motion (GtkWidget* pWidget, GdkEventMotion* pEvent)

     pLOEvent->m_nPostMouseEventX = pixelToTwip(pEvent->x, priv->m_fZoom);

     pLOEvent->m_nPostMouseEventY = pixelToTwip(pEvent->y, priv->m_fZoom);

     pLOEvent->m_nPostMouseEventCount = 1;

-    g_task_set_task_data(task, pLOEvent, g_free);

+    g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

     g_object_unref(task);

@@ -1891,7 +1891,7 @@ lok_doc_view_open_document (LOKDocView* pDocView,

     pLOEvent->m_pPath = pPath;

     priv->m_aDocPath = pPath;

-    g_task_set_task_data(task, pLOEvent, g_free);

+    g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

     g_object_unref(task);

@@ -1953,7 +1953,7 @@ lok_doc_view_set_part (LOKDocView* pDocView, int nPart)

     LOEvent* pLOEvent = new LOEvent(LOK_SET_PART);

     pLOEvent->m_nPart = nPart;

-    g_task_set_task_data(task, pLOEvent, g_free);

+    g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

     g_object_unref(task);

@@ -1975,7 +1975,7 @@ lok_doc_view_set_partmode(LOKDocView* pDocView,

     GTask* task = g_task_new(pDocView, NULL, NULL, NULL);

     LOEvent* pLOEvent = new LOEvent(LOK_SET_PARTMODE);

     pLOEvent->m_nPartMode = nPartMode;

-    g_task_set_task_data(task, pLOEvent, g_free);

+    g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

     g_object_unref(task);

@@ -1997,7 +1997,7 @@ lok_doc_view_set_edit(LOKDocView* pDocView,

     GTask* task = g_task_new(pDocView, NULL, NULL, NULL);

     LOEvent* pLOEvent = new LOEvent(LOK_SET_EDIT);

     pLOEvent->m_bEdit = bEdit;

-    g_task_set_task_data(task, pLOEvent, g_free);

+    g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

     g_object_unref(task);

@@ -2022,7 +2022,7 @@ lok_doc_view_post_command (LOKDocView* pDocView,

     pLOEvent->m_pCommand = pCommand;

     pLOEvent->m_pArguments  = g_strdup(pArguments);

-    g_task_set_task_data(task, pLOEvent, g_free);

+    g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

     g_thread_pool_push(priv->lokThreadPool, g_object_ref(task), NULL);

     g_object_unref(task);

 }

diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx

index 85f6eb0422c2..687ef44d6468 100644

--- a/libreofficekit/source/gtk/tilebuffer.cxx

+++ b/libreofficekit/source/gtk/tilebuffer.cxx

@@ -73,7 +73,7 @@ void TileBuffer::setInvalid(int x, int y, float fZoom, GTask* task,

         pLOEvent->m_nPaintTileX = x;

         pLOEvent->m_nPaintTileY = y;

         pLOEvent->m_fPaintTileZoom = fZoom;

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);

     }

 }

@@ -89,7 +89,7 @@ Tile& TileBuffer::getTile(int x, int y, float fZoom, GTask* task,

         pLOEvent->m_nPaintTileX = x;

         pLOEvent->m_nPaintTileY = y;

         pLOEvent->m_fPaintTileZoom = fZoom;

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);

         return m_mTiles[index];

     }

@@ -99,7 +99,7 @@ Tile& TileBuffer::getTile(int x, int y, float fZoom, GTask* task,

         pLOEvent->m_nPaintTileX = x;

         pLOEvent->m_nPaintTileY = y;

         pLOEvent->m_fPaintTileZoom = fZoom;

-        g_task_set_task_data(task, pLOEvent, g_free);

+        g_task_set_task_data(task, pLOEvent, LOEvent::destroy);

         g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);

         return m_DummyTile;

     }

@@ -107,5 +107,10 @@ Tile& TileBuffer::getTile(int x, int y, float fZoom, GTask* task,

     return m_mTiles[index];

 }

+void LOEvent::destroy(void* pMemory)

+{

+    LOEvent* pLOEvent = static_cast<LOEvent*>(pMemory);

+    delete pLOEvent;

+}

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx

index d4e7120e6587..fdcdd15eddd7 100644

--- a/libreofficekit/source/gtk/tilebuffer.hxx

+++ b/libreofficekit/source/gtk/tilebuffer.hxx

@@ -237,6 +237,9 @@ struct LOEvent

         , m_nSetGraphicSelectionY(0)

     {

     }

+

+    /// Wrapper around delete to help GLib.

+    static void destroy(void* pMemory);

 };

 #endif // INCLUDED_TILEBUFFER_HXX

-- 

2.12.0