Fix: Dict initializer incorrectly re-initialized field that is set to…

… an empty string fixes #9835
Icinga · Aug 5, 2015 · a7bfc5e · a7bfc5e
1 parent 8d11b74
commit a7bfc5e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/config/expression.cpp b/lib/config/expression.cpp
@@ -632,8 +632,12 @@ bool IndexerExpression::GetReference(ScriptFrame& frame, bool init_dict, Value *
 		init_dict = false;
 
 	if (m_Operand1->GetReference(frame, init_dict, &vparent, &vindex, &psdhint)) {
-		if (init_dict && VMOps::GetField(vparent, vindex, m_Operand1->GetDebugInfo()).IsEmpty())
-			VMOps::SetField(vparent, vindex, new Dictionary(), m_Operand1->GetDebugInfo());
+		if (init_dict) {
+			Value old_value =  VMOps::GetField(vparent, vindex, m_Operand1->GetDebugInfo());
+
+			if (old_value.IsEmpty() && !old_value.IsString())
+				VMOps::SetField(vparent, vindex, new Dictionary(), m_Operand1->GetDebugInfo());
+		}
 
 		*parent = VMOps::GetField(vparent, vindex, m_DebugInfo);
 		free_psd = true;