Merge pull request #192 from MoleculeDotNet/dev

smaillet-ms · smaillet-ms · commit 1e4096145d8e · 2015-06-23T16:32:25.000-07:00
Fix array range exception during WriteConfig
diff --git a/Framework/Tools/MFDeploy/Library/MFConfigHelper.cs b/Framework/Tools/MFDeploy/Library/MFConfigHelper.cs
@@ -875,7 +875,7 @@ private void WriteConfig(string configName, byte[] data, bool staticSize, bool u
                     newLastIndex++;        // Force a 4 byte boundary
                 }
 
-                byte[] temp = new byte[m_lastCfgIndex >= m_all_cfg_data.Length ? m_lastCfgIndex + data.Length : m_all_cfg_data.Length];
+                byte[] temp = new byte[m_lastCfgIndex + data.Length >= m_all_cfg_data.Length ? m_lastCfgIndex + data.Length : m_all_cfg_data.Length];
 
                 Array.Copy(m_all_cfg_data, 0, temp,              0, m_all_cfg_data.Length);
                 Array.Copy(          data, 0, temp, m_lastCfgIndex,           data.Length);

Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,7 @@ private void WriteConfig(string configName, byte[] data, bool staticSize, bool u`
`875`	`875`	`newLastIndex++; // Force a 4 byte boundary`
`876`	`876`	`}`
`877`	`877`
`878`		`- byte[] temp = new byte[m_lastCfgIndex >= m_all_cfg_data.Length ? m_lastCfgIndex + data.Length : m_all_cfg_data.Length];`
	`878`	`+ byte[] temp = new byte[m_lastCfgIndex + data.Length >= m_all_cfg_data.Length ? m_lastCfgIndex + data.Length : m_all_cfg_data.Length];`
`879`	`879`
`880`	`880`	`Array.Copy(m_all_cfg_data, 0, temp, 0, m_all_cfg_data.Length);`
`881`	`881`	`Array.Copy( data, 0, temp, m_lastCfgIndex, data.Length);`