Doctrine

Timestamp:

06/06/08 19:17:03 (13 months ago)

Author:

romanb

Message:

Fixed two memory-leaks caused by not freeing internally created query objects. Issue & patch provided by Stefan Klug through the dev-mailinglist.

Location:

branches/0.11

Files:

• lib/Doctrine/Connection.php (modified) (1 diff)
• lib/Doctrine/Table.php (modified) (1 diff)
• tests/run.php (modified) (1 diff)

branches/0.11/lib/Doctrine/Connection.php

@@ -874 +874 @@
     {
         $parser = new Doctrine_Query($this);
-
-        return $parser->query($query, $params, $hydrationMode);
+        $res = $parser->query($query, $params, $hydrationMode);
+        $parser->free();
+
+        return $res;
     }
 

branches/0.11/lib/Doctrine/Table.php

@@ -1215 +1215 @@
 
         $id = is_array($id) ? array_values($id) : array($id);
-
-        return $this->createQuery()
-            ->where(implode(' = ? AND ', (array) $this->getIdentifier()) . ' = ?', $id)
-            ->limit(1)
-            ->fetchOne(array(), $hydrationMode);
+        
+        $q = $this->createQuery();
+        $q->where(implode(' = ? AND ', (array) $this->getIdentifier()) . ' = ?', $id)
+                ->limit(1);
+        $res = $q->fetchOne(array(), $hydrationMode);
+        $q->free();
+        
+        return $res;
     }
 

branches/0.11/tests/run.php

@@ -46 +46 @@
 $tickets->addTestCase(new Doctrine_Ticket_941_TestCase());
 $tickets->addTestCase(new Doctrine_Ticket_930_TestCase());
-$tickets->addTestCase(new Doctrine_Ticket_NewTicket_TestCase());
 
 // Only uncomment the following ticket if you want to check free() performance!