Fixed memory corruption with statics strings in GValues

diff --git a/glib/defpackage.lisp b/glib/defpackage.lisp
index 33ef768ebb76416b40aeab43aacc631a0bbc76a3..cf6a9998a7c5863e1d322a6339254401f52a0c0b 100644 (file)
--- a/glib/defpackage.lisp
+++ b/glib/defpackage.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: defpackage.lisp,v 1.27 2008-10-09 18:20:52 espen Exp $
+;; $Id: defpackage.lisp,v 1.28 2008-11-04 03:22:23 espen Exp $

 
 
 (defpackage "GLIB"
 
 
 (defpackage "GLIB"


@@ -51,7 +51,8 @@ (defpackage "GLIB"
   ;; Symbols from gparam.lisp  
   (:export "GVALUE" "GVALUE-INIT" "GVALUE-NEW" "GVALUE-FREE" "GVALUE-TYPE" 
           "GVALUE-GET" "GVALUE-SET" "GVALUE-UNSET" "VALUE-P" "WITH-GVALUE" 
   ;; Symbols from gparam.lisp  
   (:export "GVALUE" "GVALUE-INIT" "GVALUE-NEW" "GVALUE-FREE" "GVALUE-TYPE" 
           "GVALUE-GET" "GVALUE-SET" "GVALUE-UNSET" "VALUE-P" "WITH-GVALUE" 

-          "+GVALUE-SIZE+" "+GVALUE-VALUE-OFFSET+" "PARAM-FLAG-TYPE" "PARAM" 
+          "+GVALUE-SIZE+" "+GVALUE-VALUE-OFFSET+" "GVALUE-STATIC-P"
+          "PARAM-FLAG-TYPE" "PARAM"

           "PARAM-CHAR" "PARAM-UNSIGNED-CHAR" "PARAM-BOOLEAN" "PARAM-INT" 
           "PARAM-UNSIGNED-INT" "PARAM-LONG" "PARAM-UNSIGNED-LONG"
           "PARAM-UNICHAR" "PARAM-ENUM" "PARAM-FLAGS" "PARAM-SINGLE-FLOAT"
           "PARAM-CHAR" "PARAM-UNSIGNED-CHAR" "PARAM-BOOLEAN" "PARAM-INT" 
           "PARAM-UNSIGNED-INT" "PARAM-LONG" "PARAM-UNSIGNED-LONG"
           "PARAM-UNICHAR" "PARAM-ENUM" "PARAM-FLAGS" "PARAM-SINGLE-FLOAT"

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index a9d47359d1679b39287cd14ac2052f5c1713c82a..bfde9d1cb28f52af745721e0ea721ac926fc0151 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gobject.lisp,v 1.58 2008-10-09 18:20:52 espen Exp $
+;; $Id: gobject.lisp,v 1.59 2008-11-04 03:22:23 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -152,12 +152,15 @@ (defmethod compute-slot-reader-function ((slotd effective-property-slot-definiti
   (declare (ignore signal-unbound-p))
   (let* ((type (slot-definition-type slotd))
         (pname (slot-definition-pname slotd))
   (declare (ignore signal-unbound-p))
   (let* ((type (slot-definition-type slotd))
         (pname (slot-definition-pname slotd))

-        (reader (reader-function type :ref :get)))
+        (get-reader (reader-function type :ref :get))
+        (peek-reader (reader-function type :ref :peek)))

     #'(lambda (object)
        (with-memory (gvalue +gvalue-size+)
          (%gvalue-init gvalue (find-type-number type))
          (%object-get-property object pname gvalue)
     #'(lambda (object)
        (with-memory (gvalue +gvalue-size+)
          (%gvalue-init gvalue (find-type-number type))
          (%object-get-property object pname gvalue)

-         (funcall reader gvalue +gvalue-value-offset+)))))
+         (if (gvalue-static-p gvalue)
+             (funcall peek-reader gvalue +gvalue-value-offset+)
+           (funcall get-reader gvalue +gvalue-value-offset+))))))

 
 (defmethod compute-slot-writer-function :around ((slotd effective-property-slot-definition))
   (if (construct-only-property-p slotd)
 
 (defmethod compute-slot-writer-function :around ((slotd effective-property-slot-definition))
   (if (construct-only-property-p slotd)

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index ea3fa447b56c5779eada5a1e52eb5702fbcfa55d..15a9f68012b39c9928cd94c0bd538d98a527b1ef 100644 (file)
--- a/glib/gparam.lisp
+++ b/glib/gparam.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gparam.lisp,v 1.26 2007-08-20 10:50:25 espen Exp $
+;; $Id: gparam.lisp,v 1.27 2008-11-04 03:22:23 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -34,6 +34,9 @@   (defbinding (size-of-gvalue "size_of_gvalue") () unsigned-int))
 (defconstant +gvalue-size+ (size-of-gvalue))
 (defconstant +gvalue-value-offset+ 
   (max (size-of 'type-number) (type-alignment '(unsigned-byte 64))))
 (defconstant +gvalue-size+ (size-of-gvalue))
 (defconstant +gvalue-value-offset+ 
   (max (size-of 'type-number) (type-alignment '(unsigned-byte 64))))

+(defconstant +gvalue-flags-offset+ 
+  (+ +gvalue-value-offset+ (size-of '(unsigned-byte 64))))
+(defconstant +gvalue-nocopy-contents-flag+ 27)

 
 (defbinding (%gvalue-init "g_value_init") () nil
   (value gvalue)
 
 (defbinding (%gvalue-init "g_value_init") () nil
   (value gvalue)


@@ -76,6 +79,15 @@ (defun gvalue-type (gvalue)
         ;; This will signal an error if the type hierarchy is unknown
         (type-from-number type-number t))))))
 
         ;; This will signal an error if the type hierarchy is unknown
         (type-from-number type-number t))))))
 

+(let ((flags-reader nil))
+  (defun gvalue-static-p (gvalue)
+    (unless flags-reader
+      (setf flags-reader (reader-function 'unsigned-int)))
+    (prog1
+       (ldb-test (byte 1 +gvalue-nocopy-contents-flag+)
+        (funcall flags-reader gvalue +gvalue-flags-offset+))
+      (force-output))))
+

 (defun gvalue-get (gvalue)
   (funcall (reader-function (gvalue-type gvalue))
    gvalue +gvalue-value-offset+))
 (defun gvalue-get (gvalue)
   (funcall (reader-function (gvalue-type gvalue))
    gvalue +gvalue-value-offset+))


@@ -85,7 +97,8 @@ (defun gvalue-peek (gvalue)
    gvalue +gvalue-value-offset+))
 
 (defun gvalue-take (gvalue)
    gvalue +gvalue-value-offset+))
 
 (defun gvalue-take (gvalue)

-  (funcall (reader-function (gvalue-type gvalue) :ref :get)
+  (funcall (reader-function (gvalue-type gvalue) 
+   :ref (if (gvalue-static-p gvalue) :peek :get))

    gvalue +gvalue-value-offset+))
 
 (defun gvalue-set (gvalue value)
    gvalue +gvalue-value-offset+))
 
 (defun gvalue-set (gvalue value)