This is an automated email from the ASF dual-hosted git repository. scantor pushed a commit to branch xerces-3.2 in repository https://gitbox.apache.org/repos/asf/xerces-c.git
commit e751104cadac7634293e54d325d6ed7c9a1ed571 Author: Scott Cantor <canto...@osu.edu> AuthorDate: Wed Oct 5 13:54:19 2022 -0400 Revert "Merge pull request #29 from rouault/backport_3_2_curl_memleak_fix" This reverts commit 9ac2a9cb749e307b67e4622f77ff66cb9f05f584, reversing changes made to 19428fbac5d0b4de89f780e485fd924482678309. --- .../util/NetAccessors/Curl/CurlURLInputStream.cpp | 28 +--------------------- .../util/NetAccessors/Curl/CurlURLInputStream.hpp | 2 -- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp b/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp index 2980dc211..5ed659389 100644 --- a/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp +++ b/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.cpp @@ -160,20 +160,7 @@ CurlURLInputStream::CurlURLInputStream(const XMLURL& urlSource, const XMLNetHTTP while(fBufferHeadPtr == fBuffer) { int runningHandles = 0; - try - { - readMore(&runningHandles); - } - catch(const MalformedURLException&) - { - cleanup(); - throw; - } - catch(const NetAccessorException&) - { - cleanup(); - throw; - } + readMore(&runningHandles); if(runningHandles == 0) break; } @@ -187,31 +174,18 @@ CurlURLInputStream::CurlURLInputStream(const XMLURL& urlSource, const XMLNetHTTP CurlURLInputStream::~CurlURLInputStream() { - cleanup(); -} - - -void CurlURLInputStream::cleanup() -{ - if (!fMulti ) - return; - // Remove the easy handle from the multi stack curl_multi_remove_handle(fMulti, fEasy); // Cleanup the easy handle curl_easy_cleanup(fEasy); - fEasy = NULL; // Cleanup the multi handle curl_multi_cleanup(fMulti); - fMulti = NULL; if(fContentType) fMemoryManager->deallocate(fContentType); - fContentType = NULL; if(fHeadersList) curl_slist_free_all(fHeadersList); - fHeadersList = NULL; } diff --git a/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp b/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp index 3900d4db5..f75857b92 100644 --- a/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp +++ b/src/xercesc/util/NetAccessors/Curl/CurlURLInputStream.hpp @@ -61,8 +61,6 @@ private : CurlURLInputStream(const CurlURLInputStream&); CurlURLInputStream& operator=(const CurlURLInputStream&); - void cleanup(); - static size_t staticWriteCallback(char *buffer, size_t size, size_t nitems, --------------------------------------------------------------------- To unsubscribe, e-mail: c-dev-unsubscr...@xerces.apache.org For additional commands, e-mail: c-dev-h...@xerces.apache.org