Ticket #378: patch

matcher/multiandpostlist.cc

@@ -194 +194 @@
         return NULL;
     }
     did = plist[0]->get_docid();
+    Xapian::weight max_remaining = max_total - (max_wt[0] - plist[0]->get_weight());
     for (size_t i = 1; i < n_kids; ++i) {
+        if (max_remaining < w_min) {
+            next_helper(0, w_min);
+            goto advanced_plist0;
+        }
         bool valid;
         check_helper(i, did, w_min, valid);
         if (!valid) {
@@ -210 +215 @@
             skip_to_helper(0, new_did, w_min);
             goto advanced_plist0;
         }
+        max_remaining -= max_wt[i] - plist[i]->get_weight();
     }
     return NULL;
 }