From 32288c27a523a1152afa019b9152f4401c3097ce Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <kenlm@kheafield.com>
Date: Mon, 26 Sep 2011 16:54:16 -0400
Subject: Fix trie pointer segfault

---
 klm/lm/trie.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'klm/lm/trie.cc')

diff --git a/klm/lm/trie.cc b/klm/lm/trie.cc
index 4e60b184..20075bb8 100644
--- a/klm/lm/trie.cc
+++ b/klm/lm/trie.cc
@@ -91,16 +91,14 @@ template <class Quant, class Bhiksha> bool BitPackedMiddle<Quant, Bhiksha>::Find
   if (!FindBitPacked(base_, word_mask_, word_bits_, total_bits_, range.begin, range.end, max_vocab_, word, at_pointer)) {
     return false;
   }
-  uint64_t index = at_pointer;
+  pointer = at_pointer;
   at_pointer *= total_bits_;
   at_pointer += word_bits_;
 
-  pointer = at_pointer;
-
   quant_.Read(base_, at_pointer, prob, backoff);
   at_pointer += quant_.TotalBits();
 
-  bhiksha_.ReadNext(base_, at_pointer, index, total_bits_, range);
+  bhiksha_.ReadNext(base_, at_pointer, pointer, total_bits_, range);
 
   return true;
 }
-- 
cgit v1.2.3