Merge pull request #20293 from endjkv:fix-mem-leak-when-throw

endjkv · web-flow · commit 42d644ef9134 · 2021-06-27T00:01:31.000+03:00
* fix memory leak when exception is thrown
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
@@ -1835,7 +1835,15 @@ void* TLSDataContainer::getData() const
     {
         // Create new data instance and save it to TLS storage
         pData = createDataInstance();
-        getTlsStorage().setData(key_, pData);
+        try
+        {
+            getTlsStorage().setData(key_, pData);
+        }
+        catch (...)
+        {
+            deleteDataInstance(pData);
+            throw;
+        }
     }
     return pData;
 }

Original file line number	Diff line number	Diff line change
`@@ -1835,7 +1835,15 @@ void* TLSDataContainer::getData() const`
`1835`	`1835`	`{`
`1836`	`1836`	`// Create new data instance and save it to TLS storage`
`1837`	`1837`	`pData = createDataInstance();`
`1838`		`- getTlsStorage().setData(key_, pData);`
	`1838`	`+ try`
	`1839`	`+ {`
	`1840`	`+ getTlsStorage().setData(key_, pData);`
	`1841`	`+ }`
	`1842`	`+ catch (...)`
	`1843`	`+ {`
	`1844`	`+ deleteDataInstance(pData);`
	`1845`	`+ throw;`
	`1846`	`+ }`
`1839`	`1847`	`}`
`1840`	`1848`	`return pData;`
`1841`	`1849`	`}`