check state object are not null before using it. For alternate weights setting where some feature functions are not used for a particular sentence

1 files changed, 14 insertions, 6 deletions

diff --git a/moses/Hypothesis.cpp b/moses/Hypothesis.cpp
index 0dc591ab3..5482de9f5 100644
--- a/moses/Hypothesis.cpp
+++ b/moses/Hypothesis.cpp
@@ -415,8 +415,11 @@ size_t Hypothesis::hash() const
   // states
   for (size_t i = 0; i < m_ffStates.size(); ++i) {
     const FFState *state = m_ffStates[i];
-    size_t hash = state->hash();
-    boost::hash_combine(seed, hash);
+
+    if (state) {
+		size_t hash = state->hash();
+		boost::hash_combine(seed, hash);
+    }
   }
   return seed;
 }
@@ -430,10 +433,15 @@ bool Hypothesis::operator==(const Hypothesis& other) const
 
   // states
   for (size_t i = 0; i < m_ffStates.size(); ++i) {
-    const FFState &thisState = *m_ffStates[i];
-    const FFState &otherState = *other.m_ffStates[i];
-    if (thisState != otherState) {
-      return false;
+    const FFState *thisState = m_ffStates[i];
+
+    if (thisState) {
+		const FFState *otherState = other.m_ffStates[i];
+		assert(otherState);
+
+		if ((*thisState) != (*otherState)) {
+		  return false;
+		}
     }
   }
   return true;