[ CID 118225 ] Fix potential uninitialised memory error

livecodeian · livecodeian · commit c4cbee1d935b · 2015-10-21T17:23:43.000+01:00
diff --git a/libbrowser/src/libbrowser_value.cpp b/libbrowser/src/libbrowser_value.cpp
@@ -663,10 +663,12 @@ class MCBrowserDictionary : public MCBrowserRefCounted
 		if (p_size <= m_capacity)
 			return true;
 		
-		uindex_t t_capacity;
-		if (MCBrowserMemoryResizeArray(p_size, m_elements, t_capacity) && MCBrowserMemoryResizeArray(p_size, m_keys, t_capacity))
+		uindex_t t_element_capacity, t_key_capacity;
+		// Need to pass original capacity to BOTH calls to MCBrowserMemoryResizeArray, to ensure memory is appropriately cleared.
+		t_element_capacity = t_key_capacity = m_capacity;
+		if (MCBrowserMemoryResizeArray(p_size, m_elements, t_element_capacity) && MCBrowserMemoryResizeArray(p_size, m_keys, t_key_capacity))
 		{
-			m_capacity = t_capacity;
+			m_capacity = t_element_capacity;
 			return true;
 		}
 		

Original file line number	Diff line number	Diff line change
`@@ -663,10 +663,12 @@ class MCBrowserDictionary : public MCBrowserRefCounted`
`663`	`663`	`if (p_size <= m_capacity)`
`664`	`664`	`return true;`
`665`	`665`
`666`		`- uindex_t t_capacity;`
`667`		`- if (MCBrowserMemoryResizeArray(p_size, m_elements, t_capacity) && MCBrowserMemoryResizeArray(p_size, m_keys, t_capacity))`
	`666`	`+ uindex_t t_element_capacity, t_key_capacity;`
	`667`	`+ // Need to pass original capacity to BOTH calls to MCBrowserMemoryResizeArray, to ensure memory is appropriately cleared.`
	`668`	`+ t_element_capacity = t_key_capacity = m_capacity;`
	`669`	`+ if (MCBrowserMemoryResizeArray(p_size, m_elements, t_element_capacity) && MCBrowserMemoryResizeArray(p_size, m_keys, t_key_capacity))`
`668`	`670`	`{`
`669`		`- m_capacity = t_capacity;`
	`671`	`+ m_capacity = t_element_capacity;`
`670`	`672`	`return true;`
`671`	`673`	`}`
`672`	`674`