1.0.22.10: detect infinite recursion during wrapper validation

[sbcl.git] / src / pcl / wrapper.lisp

diff --git a/src/pcl/wrapper.lisp b/src/pcl/wrapper.lisp
index 49738e5..d67e1c4 100644 (file)
--- a/src/pcl/wrapper.lisp
+++ b/src/pcl/wrapper.lisp
@@ -99,8 +99,10 @@
 (declaim (inline wrapper-class*))
 (defun wrapper-class* (wrapper)
   (or (wrapper-class wrapper)
-      (ensure-non-standard-class
-       (classoid-name (layout-classoid wrapper)))))
+      (let ((classoid (layout-classoid wrapper)))
+        (ensure-non-standard-class
+         (classoid-name classoid)
+         classoid))))
 
 ;;; The wrapper cache machinery provides general mechanism for
 ;;; trapping on the next access to any instance of a given class. This
@@ -152,6 +154,9 @@
     (remhash owrapper *previous-nwrappers*)
     (setf (gethash nwrapper *previous-nwrappers*) new-previous)))
 
+;;; FIXME: This is not a good name: part of the constract here is that
+;;; we return the valid wrapper, which is not obvious from the name
+;;; (or the names of our callees.)
 (defun check-wrapper-validity (instance)
   (let* ((owrapper (wrapper-of instance))
          (state (layout-invalid owrapper)))
@@ -173,6 +178,10 @@
            ;;    INSTANCE's class.  See also the comment above
            ;;    FORCE-CACHE-FLUSHES.  Paul Dietz has test cases for this.
            (force-cache-flushes (class-of instance))
+           ;; KLUDGE avoid an infinite recursion, it's still better to
+           ;; bail out with an AVER for server softwares. see FIXME above.
+           ;; details: http://thread.gmane.org/gmane.lisp.steel-bank.devel/10175
+           (aver (not (eq (layout-invalid (wrapper-of instance)) t)))
            (check-wrapper-validity instance))
           ((consp state)
            (ecase (car state)
@@ -188,11 +197,11 @@
   (when (invalid-wrapper-p (layout-of instance))
     (check-wrapper-validity instance)))
 
-(defun check-obsolete-instance/wrapper-of (instance)
+(defun valid-wrapper-of (instance)
   (let ((wrapper (wrapper-of instance)))
-    (when (invalid-wrapper-p wrapper)
-      (check-wrapper-validity instance))
-    wrapper))
+    (if (invalid-wrapper-p wrapper)
+        (check-wrapper-validity instance)
+        wrapper)))
 \f
 ;;;  NIL: means nothing so far, no actual arg info has NILs in the
 ;;;  metatype.