Changeset 186

Timestamp:

12/06/11 13:51:18 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Add some more loop-breaking to isParent() to break infinite loops
that cause *big* messes in the error log (see #25)

• just return 0 on parent == 0, 1 on child == 0
• break the while() if the fetch returns no results, otherwise we end up trying to retrieve records for id=<undef>

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1499 +1499 @@
   return 0 if $type1 eq 'domain' && $type2 ne 'record'; # domain may not be a parent of anything other than a record
 
+  # ennnhhhh....  if we're passed an id of 0, it will never be found.  usual
+  # case would be the UI creating a new <thing>, and so we don't have an ID for
+  # <thing> to look up yet.  in that case the UI should check the parent as well.
+  # argument for returning 1 is
+  return 0 if $id1 == 0;        # nothing can have a parent id of 0
+  return 1 if $id2 == 0;        # anything could have a child id of 0 (or "unknown")
+
   # group 1 is the ultimate root parent
   return 1 if $type1 eq 'group' && $id1 == 1;
@@ -1510 +1517 @@
   my $foundparent = 0;
 
+  my $limiter = 0;
   while (1) {
     my $sql = "SELECT $par_col{$type} FROM $par_tbl{$type} WHERE $id_col{$type} = ?";
     my $result = $dbh->selectrow_hashref($sql,
         undef, ($id) );
+    if (!$result) {
+      $limiter++;
+##fixme:  how often will this happen on a live site?
+      warn "no results looking for $sql with id $id (depth $limiter)\n";
+      last;
+    }
     if ($result && $result->{$par_col{$type}} == $id1) {
       $foundparent = 1;