[ViewVC] Diff of: cvs/deliantra/server/server/cfperl.xs

Comparing deliantra/server/server/cfperl.xs (file contents):
Revision 1.153 by root, Fri Jan 26 20:59:57 2007 UTC vs.
Revision 1.155 by root, Fri Jan 26 22:06:30 2007 UTC

 {
   return refcnt + (self ? SvREFCNT (self) - 1 : 0);
 }
 void
+attachable::sever_self ()
+{
+  if (HV *self = this->self)
+    {
+      // keep a refcount because sv_unmagic might call attachable_free,
+      // which might clear self, causing sv_unmagic to crash on a now
+      // invalid object.
+      SvREFCNT_inc (self);
+      hv_clear (self);
+      sv_unmagic ((SV *)self, PERL_MAGIC_ext);
+      SvREFCNT_dec (self);
+      // self *must* be null now because thats sv_unmagic's job.
+      assert (!this->self);
+    }
+}
+void
 attachable::optimise ()
 {
   if (self
       && SvREFCNT (self) == 1
       && !HvTOTALKEYS (self))
-    {
+    sever_self ();
-      sv_unmagic ((SV *)self, PERL_MAGIC_ext);
-      assert (!self);
-    }
 }
 // check wether the object really is dead
 void
 attachable::do_check ()
       SvREFCNT_dec (cb);
       cb = 0;
     }
   if (self)
-    {
+    sever_self ();
-      hv_clear (self);
-      sv_unmagic ((SV *)self, PERL_MAGIC_ext);
-      // self is now 0
-      assert (!self);//D//TODO remove soon
-    }
   mortals.push_back (this);
 }
 void

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines