[epiphany/mcatanzaro/#1014: 5/5] web-process-extension: store frame IDs as pointers

[Jan-Michael Brummer <jbrummer src gnome org>]

commit 1751ea092047a3d15409953eafac9f0b68685934
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Nov 28 12:22:15 2019 -0600

    web-process-extension: store frame IDs as pointers
    
    We can't store 64-bit integers in pointers, because it's broken on
    32-bit systems (once the frame ID grows large enough). Admittedly this
    is slightly pedantic, but the frame IDs use guint64 for a reason and we
    shouldn't break that.
    
    Fixes #1014

 embed/web-process-extension/ephy-web-process-extension.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/embed/web-process-extension/ephy-web-process-extension.c 
b/embed/web-process-extension/ephy-web-process-extension.c
index d779aa7af..4db9c7114 100644
--- a/embed/web-process-extension/ephy-web-process-extension.c
+++ b/embed/web-process-extension/ephy-web-process-extension.c
@@ -161,6 +161,8 @@ web_page_form_controls_associated (WebKitWebPage           *web_page,
   g_autoptr (JSCValue) js_ephy = NULL;
   g_autoptr (JSCValue) js_serializer = NULL;
   g_autoptr (JSCValue) js_result = NULL;
+  guint64 frame_id;
+  guint64 *frame_id_copy;
   guint i;
 
   js_context = webkit_frame_get_js_context_for_script_world (frame, extension->script_world);
@@ -186,8 +188,11 @@ web_page_form_controls_associated (WebKitWebPage           *web_page,
                                               JSC_TYPE_VALUE, js_serializer,
                                               G_TYPE_NONE);
 
-  if (!g_hash_table_contains (extension->frames_map, GINT_TO_POINTER (webkit_frame_get_id (frame)))) {
-    g_hash_table_insert (extension->frames_map, GINT_TO_POINTER (webkit_frame_get_id (frame)), frame);
+  frame_id = webkit_frame_get_id (frame);
+  if (!g_hash_table_contains (extension->frames_map, &frame_id)) {
+    frame_id_copy = g_malloc (sizeof (guint64));
+    *frame_id_copy = frame_id;
+    g_hash_table_insert (extension->frames_map, g_steal_pointer (&frame_id_copy), frame);
     g_object_weak_ref (G_OBJECT (frame), (GWeakNotify)frame_destroyed_notify, extension);
   }
 }
@@ -349,7 +354,7 @@ get_password_manager (EphyWebProcessExtension *self,
   g_autoptr (JSCContext) js_context = NULL;
   g_autoptr (JSCValue) js_ephy = NULL;
 
-  frame = g_hash_table_lookup (self->frames_map, GINT_TO_POINTER (frame_id));
+  frame = g_hash_table_lookup (self->frames_map, &frame_id);
   if (!frame)
     return NULL;
 
@@ -790,6 +795,6 @@ ephy_web_process_extension_initialize (EphyWebProcessExtension *extension,
                             G_CALLBACK (ephy_web_process_extension_page_created_cb),
                             extension);
 
-  extension->frames_map = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-                                                 NULL, NULL);
+  extension->frames_map = g_hash_table_new_full (g_int64_hash, g_int64_equal,
+                                                 g_free, NULL);
 }