Changeset 165

Timestamp:

04/18/2006 06:40:14 AM (6 years ago)

Author:

cirrus

Message:

Fix: Gearth download could cause a memory exhaustion due to a couple of variables not being unset.

File:

• trunk/includes/pages/gearth/gearth_download.php (modified) (9 diffs)

trunk/includes/pages/gearth/gearth_download.php

@@ -37 +37 @@
                 $links_clients = "";
                 $unlinked = "";
-                $node = $db->get('latitude, longitude', 'nodes', "id = ".intval(get('node')));
-                $node = $node[0];
+                if (get('node') != '') {
+                        $node = $db->get('latitude, longitude', 'nodes', "id = ".intval(get('node')));
+                        $node = $node[0];
+                }
 
                 if (get('node') != '') $having .= ($having!=''?' OR ':'')."id = ".intval(get('node'));
@@ -162 +164 @@
                                         $unlinked .= $xml2;
                                 }
-                        }
-
+                                unset($xml2);
+                        }
+                        unset($nodes);
                         if (get('show_links_p2p') == 1) $where .= ($where!=''?' OR ':'')."p2p.type = 'p2p'";
                         if (get('show_clients') == 1 && get('show_links_client') == 1) $where .= ($where!=''?' OR ':'')."clients.type = 'client'";
@@ -213 +216 @@
                                                 $links_clients .= $xml2;
                                 }
-                        }
-
+                                unset($xml2);
+                        }
+
+                        unset($links);
 
                         $xml .= "<?xml version='1.0' encoding='".$lang['charset']."'?>\n";
@@ -272 +277 @@
                                 $xml .= "<visibility>1</visibility>\n";
                         $xml .= $bb;
+                        unset($bb);
                         $xml .= "</Folder>\n";
                         $xml .= "<Folder>\n";
@@ -281 +287 @@
                                 $xml .= "<visibility>1</visibility>\n";
                         $xml .= $ap;
+                        unset($ap);
                         $xml .= "</Folder>\n";
                         if (get('show_clients') == 1) {
@@ -288 +295 @@
                                 $xml .= "<open>0</open>\n";
                                 $xml .= $clients;
+                                unset($clients);
                                 $xml .= "</Folder>\n";
                         }
@@ -296 +304 @@
                                 $xml .= "<open>0</open>\n";
                                 $xml .= $unlinked;
+                                unset($unlinked);
                                 $xml .= "</Folder>\n";
                         }
@@ -310 +319 @@
                                         $xml .= "<visibility>1</visibility>\n";
                                 $xml .= $links_bb;
+                                unset($links_bb);
                                 $xml .= "</Folder>\n";
                                 if (get('show_clients') == 1 && get('show_links_client') == 1) {
@@ -320 +330 @@
                                                 $xml .= "<visibility>1</visibility>\n";
                                         $xml .= $links_clients;
+                                        unset($links_clients);
                                         $xml .= "</Folder>\n";
                                 }