Ticket #838: clear-hint.patch

xapian-core/matcher/queryoptimiser.h

@@ -158 +158 @@
 
     void destroy_postlist(PostList* pl) {
         if (!pl) return;
-        if (pl == static_cast<PostList*>(hint)) {
-            hint_owned = true;
-        } else {
-            if (!hint_owned) {
-                // The hint could be a subpostlist of pl, but we can't easily
-                // tell so we have to do the safe thing and reset it.
-                //
-                // This isn't ideal, but it's much better than use-after-free
-                // bugs.
-                hint = nullptr;
-            }
-            delete pl;
-        }
+        set_hint_postlist(nullptr);
         // Remove the EstimateOp (and any sub-ops) which we generated for this
         // PostList.
         localsubmatch.pop_op();