[ CID 118225 ] Fix memory leak - unreleased string in MCCefDictionaryToBrowserDictionary

livecodeian · livecodeian · commit 08eb4960fa24 · 2015-10-21T16:15:31.000+01:00
diff --git a/libbrowser/src/libbrowser_cef.cpp b/libbrowser/src/libbrowser_cef.cpp
@@ -119,7 +119,7 @@ bool MCCefListToBrowserList(CefRefPtr<CefListValue> p_list, MCBrowserListRef &r_
 				char *t_string = nil;
 				t_success = MCCefStringToUtf8String(p_list->GetString(i), t_string) && MCBrowserListSetUTF8String(t_list, i, t_string);
 				if (t_string != nil)
-				MCCStringFree(t_string);
+					MCCStringFree(t_string);
 				break;
 			}
 			
@@ -221,6 +221,9 @@ bool MCCefDictionaryToBrowserDictionary(CefRefPtr<CefDictionaryValue> p_dict, MC
 					t_success = false;
 			}
 		}
+		
+		if (t_key != nil)
+			MCCStringFree(t_key);
 	}
 	
 	if (t_success)
diff --git a/libbrowser/src/libbrowser_value.cpp b/libbrowser/src/libbrowser_value.cpp
@@ -663,7 +663,14 @@ class MCBrowserDictionary : public MCBrowserRefCounted
 		if (p_size <= m_capacity)
 			return true;
 		
-		return MCBrowserMemoryResizeArray(p_size, m_elements, m_capacity) && MCBrowserMemoryResizeArray(p_size, m_keys, m_capacity);
+		uindex_t t_capacity;
+		if (MCBrowserMemoryResizeArray(p_size, m_elements, t_capacity) && MCBrowserMemoryResizeArray(p_size, m_keys, t_capacity))
+		{
+			m_capacity = t_capacity;
+			return true;
+		}
+		
+		return false;
 	}
 	
 	bool FindElement(const char *p_key, uint32_t &r_index)

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ bool MCCefListToBrowserList(CefRefPtr<CefListValue> p_list, MCBrowserListRef &r_`
`119`	`119`	`char *t_string = nil;`
`120`	`120`	`t_success = MCCefStringToUtf8String(p_list->GetString(i), t_string) && MCBrowserListSetUTF8String(t_list, i, t_string);`
`121`	`121`	`if (t_string != nil)`
`122`		`- MCCStringFree(t_string);`
	`122`	`+ MCCStringFree(t_string);`
`123`	`123`	`break;`
`124`	`124`	`}`
`125`	`125`
`@@ -221,6 +221,9 @@ bool MCCefDictionaryToBrowserDictionary(CefRefPtr<CefDictionaryValue> p_dict, MC`
`221`	`221`	`t_success = false;`
`222`	`222`	`}`
`223`	`223`	`}`
	`224`	`+`
	`225`	`+ if (t_key != nil)`
	`226`	`+ MCCStringFree(t_key);`
`224`	`227`	`}`
`225`	`228`
`226`	`229`	`if (t_success)`