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.hh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/klm/lm/trie.hh b/klm/lm/trie.hh
index a9f5e417..06cc96ac 100644
--- a/klm/lm/trie.hh
+++ b/klm/lm/trie.hh
@@ -99,10 +99,11 @@ template <class Quant, class Bhiksha> class BitPackedMiddle : public BitPacked {
     bool FindNoProb(WordIndex word, float &backoff, NodeRange &range) const;
 
     NodeRange ReadEntry(uint64_t pointer, float &prob) {
-      quant_.ReadProb(base_, pointer, prob);
+      uint64_t addr = pointer * total_bits_;
+      addr += word_bits_;
+      quant_.ReadProb(base_, addr, prob);
       NodeRange ret;
-      // pointer/total_bits_ should always round down.  
-      bhiksha_.ReadNext(base_, pointer + quant_.TotalBits(), pointer / total_bits_, total_bits_, ret);
+      bhiksha_.ReadNext(base_, addr + quant_.TotalBits(), pointer, total_bits_, ret);
       return ret;
     }
 
-- 
cgit v1.2.3