[ViewVC] Diff of: cvs/deliantra/server/common/arch.C

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.76 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.79 by root, Sun May 4 11:12:40 2008 UTC

  * - name: The name we're searching for (ex: "writing pen");
  * Return value:
  * - a corresponding object if found; a singularity object if not found.
  * Note by MSW - it appears that it takes the full name and keeps
  * shortening it until it finds a match.  I re-wrote this so that it
- * doesn't malloc it each time - not that this function is used much,
+ * doesn't allocate it each time - not that this function is used much,
  * but it otherwise had a big memory leak.
  */
 object *
 get_archetype_by_object_name (const char *name)
 {
       if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
         ++idx;
       else
         {
           LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
-          assert (at->arch == at); // verify that refcnt == 1 is truely valid
+          assert (at->arch == at); // verify that refcnt == 1 is truly valid
           allarch.erase (idx);
+          // break chain
+          for (object *op = at->head_ (); op; )
+            {
+              object *next = op->more;
+              op->head = 0;
+              op->more = 0;
+              op = next;
+            }
+          at->destroy ();
           at->arch = 0;
-          at->more = 0;
-          at->destroy ();
         }
     }
   while (--cnt);
 }

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