glib: Fix memory overwrite in translate-to-foreign for variant cstructures

[cl-gtk2.git] / glib / gobject.foreign-gboxed.lisp

diff --git a/glib/gobject.foreign-gboxed.lisp b/glib/gobject.foreign-gboxed.lisp
index 5cfa77d..b196cab 100644 (file)
--- a/glib/gobject.foreign-gboxed.lisp
+++ b/glib/gobject.foreign-gboxed.lisp
@@ -476,25 +476,27 @@ If it is a function designator then it specifies a function that accepts the new
           (t (g-value-take-boxed gvalue (g-boxed->cstruct value :alloc-type :boxed)))))
       (g-value-set-boxed gvalue (null-pointer))))
 
-(defun parse-gvalue-boxed (gvalue)
-  (let* ((g-type (gvalue-type gvalue))
+(defun parse-g-value-boxed (gvalue)
+  (let* ((g-type (g-value-type gvalue))
          (type-name (g-type-name g-type))
          (boxed-type (get-registered-boxed-type type-name)))
     (unless boxed-type
       (warn "Type ~A is a not registered GBoxed~%" type-name)
-      (return-from parse-gvalue-boxed nil))
+      (return-from parse-g-value-boxed nil))
     (unless (null-pointer-p (g-value-get-boxed gvalue))
       (cond
         ((subtypep boxed-type 'g-boxed-ref) (convert-g-boxed-ref-from-pointer (g-value-get-boxed gvalue) boxed-type (make-instance 'g-boxed-ref-type :class-name boxed-type :owner :foreign)))
         (t (parse-g-boxed (g-value-get-boxed gvalue) boxed-type))))))
 
-(defmethod parse-gvalue-for-type (gvalue-ptr (type-numeric (eql +g-type-boxed+)))
-  (if (= (g-type-numeric (gvalue-type gvalue-ptr)) type-numeric)
+(defmethod parse-g-value-for-type (gvalue-ptr (type-numeric (eql +g-type-boxed+)) parse-kind)
+  (declare (ignore parse-kind))
+  (if (g-type= (g-value-type gvalue-ptr) (g-strv-get-type))
       (convert-from-foreign (g-value-get-boxed gvalue-ptr) '(glib:gstrv :free-from-foreign nil))
-      (parse-gvalue-boxed gvalue-ptr)))
+      (parse-g-value-boxed gvalue-ptr)))
 
 (defmethod set-gvalue-for-type (gvalue-ptr (type-numeric (eql +g-type-boxed+)) value)
-  (if (= (g-type-numeric (gvalue-type gvalue-ptr)) type-numeric)
+  (format t "Converting ~A of GBoxed type ~A~%" value (g-type-string (g-value-type gvalue-ptr)))
+  (if (g-type= (g-value-type gvalue-ptr) (g-strv-get-type))
       (g-value-set-boxed gvalue-ptr (convert-to-foreign value '(glib:gstrv :free-from-foreign nil)))
       (set-gvalue-boxed gvalue-ptr value)))