[evolution] EEditorWebExtension: Use-after-free when restoring the inline images

[Tomas Popela <tpopela src gnome org>]

commit 3686dbbecc3934b281aefc354a729f635a5ff601
Author: Tomas Popela <tpopela redhat com>
Date:   Wed Nov 30 15:10:32 2016 +0100

    EEditorWebExtension: Use-after-free when restoring the inline images
    
    Restore the inline images when the GVariant that's holding them is valid
    (before we pass it to g_dbus_method_invocation_return_value).

 .../web-extension/e-editor-web-extension.c         |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c 
b/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
index eb56e43..35776fa 100644
--- a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
+++ b/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
@@ -1794,6 +1794,9 @@ handle_method_call (GDBusConnection *connection,
                        g_warning ("Unsupported flags combination (%d) in (%s)", flags, G_STRFUNC);
                }
 
+               if ((flags & E_CONTENT_EDITOR_GET_INLINE_IMAGES) && from_domain && *from_domain && 
inline_images)
+                       e_editor_dom_restore_images (editor_page, inline_images);
+
                /* If no inline images are requested we still have to return
                 * something even it won't be used at all. */
                g_dbus_method_invocation_return_value (
@@ -1804,9 +1807,6 @@ handle_method_call (GDBusConnection *connection,
                                inline_images ? inline_images : g_variant_new_int32 (0)));
 
                g_free (value);
-
-               if ((flags & E_CONTENT_EDITOR_GET_INLINE_IMAGES) && from_domain && *from_domain && 
inline_images)
-                       e_editor_dom_restore_images (editor_page, inline_images);
        } else if (g_strcmp0 (method_name, "DOMInsertHTML") == 0) {
                const gchar *html;