PaganOS Luna 0.6.0
PL EN DE
🔒 Repository is read-only – file editing is disabled.

recipes/core/glib/glib-ffi-custom-pointer-1.patch main

58 lines Raw ← Back
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
--- a/gobject/gclosure.c	2026-10-11 12:20:45.279155594 +0200
+++ b/gobject/gclosure.c	2026-10-11 12:20:45.279155594 +0200
@@ -1276,6 +1276,39 @@
 }
 
 #include <ffi.h>
+/* Typy z wlasnym fundamentalem (nie GObject/boxed), ktore trzymaja wartosc jako
+ * wskaznik w gvalue->data[0].v_pointer (np. DexObject z libdex). GLib nie ma dla
+ * nich galezi w value_to_ffi_type i podawal NULL do libffi, co konczylo sie SEGV.
+ * Rozpoznajemy "pointer-compatible" typy i przekazujemy realny wskaznik.
+ * Backport z GLib main (value_type_is_custom_pointer_compatible). */
+static gboolean
+value_type_is_custom_pointer_compatible (GType type)
+{
+  GTypeValueTable *value_table;
+
+  switch (g_type_fundamental (type))
+    {
+    case G_TYPE_STRING:
+    case G_TYPE_OBJECT:
+    case G_TYPE_BOXED:
+    case G_TYPE_PARAM:
+    case G_TYPE_POINTER:
+    case G_TYPE_INTERFACE:
+    case G_TYPE_VARIANT:
+      return FALSE;
+    default:
+      break;
+    }
+
+  value_table = g_type_value_table_peek (type);
+
+  return G_TYPE_IS_INSTANTIATABLE (type) &&
+         value_table != NULL &&
+         value_table->value_peek_pointer != NULL &&
+         value_table->collect_format != NULL &&
+         strcmp (value_table->collect_format, "p") == 0;
+}
+
 static ffi_type *
 value_to_ffi_type (const GValue *gvalue,
                    gpointer *value,
@@ -1361,8 +1394,13 @@
       break;
     default:
       rettype = &ffi_type_pointer;
-      *value = NULL;
-      g_critical ("value_to_ffi_type: Unsupported fundamental type: %s", g_type_name (type));
+      if (value_type_is_custom_pointer_compatible (G_VALUE_TYPE (gvalue)))
+        *value = (gpointer)&(gvalue->data[0].v_pointer);
+      else
+        {
+          *value = NULL;
+          g_critical ("value_to_ffi_type: Unsupported fundamental type: %s", g_type_name (type));
+        }
       break;
     }
   return rettype;