Index: comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.459
diff -u -p -r1.459 comment.module
--- comment.module	20 May 2006 08:14:09 -0000	1.459
+++ comment.module	23 Jun 2006 00:21:06 -0000
@@ -1653,10 +1653,15 @@ function _comment_delete_thread($comment
   comment_invoke_comment($comment, 'delete');
 
   // Delete the comment's replies
-  $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE pid = %d', $comment->cid);
-  while ($comment = db_fetch_object($result)) {
-    $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
-    _comment_delete_thread($comment);
+  if (!ctype_digit($comment->cid)) {
+    watchdog('content', t('Warning, invalid ->cid passed'), WATCHDOG_WARNING);
+  }
+  else {
+    $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE pid = %d', $comment->cid);
+    while ($comment = db_fetch_object($result)) {
+      $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
+      _comment_delete_thread($comment);
+    }
   }
 }