realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Protect against calling curl_easy_cleanup after curl_global_cleanup.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/17103
Fixes KICAD-7DP
This commit is contained in:
Alex Shvartzkop 2025-01-22 13:49:37 +03:00
parent 4eaadcae5c
commit 0c694de209
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/kicad_curl/kicad_curl_easy.cpp
View File

@ -120,7 +120,8 @@ static int progressinfo( void* aProgress, double aDLtotal, double aDLnow, double
KICAD_CURL_EASY::KICAD_CURL_EASY() : KICAD_CURL_EASY::KICAD_CURL_EASY() :
m_headers( nullptr ) m_headers( nullptr ),
m_curlSharedLock( KICAD_CURL::Mutex() )
{ {
m_CURL = curl_easy_init(); m_CURL = curl_easy_init();
@ -200,12 +201,6 @@ KICAD_CURL_EASY::~KICAD_CURL_EASY()
int KICAD_CURL_EASY::Perform() int KICAD_CURL_EASY::Perform()
{ {
std::shared_lock lock( KICAD_CURL::Mutex(), std::try_to_lock );
// If can't lock, we should be in the process of tearing down.
if( !lock )
return CURLE_ABORTED_BY_CALLBACK;
if( m_headers ) if( m_headers )
curl_easy_setopt( m_CURL, CURLOPT_HTTPHEADER, m_headers ); curl_easy_setopt( m_CURL, CURLOPT_HTTPHEADER, m_headers );

10
include/kicad_curl/kicad_curl_easy.h
View File

@ -39,6 +39,7 @@
#include <ostream> #include <ostream>
#include <string> #include <string>
#include <cstdint> #include <cstdint>
#include <shared_mutex>
typedef void CURL; typedef void CURL;
struct curl_slist; struct curl_slist;
@ -163,10 +164,11 @@ private:
template <typename T> template <typename T>
int setOption( int aOption, T aArg ); int setOption( int aOption, T aArg );
CURL* m_CURL; CURL* m_CURL;
curl_slist* m_headers; curl_slist* m_headers;
std::string m_buffer; std::string m_buffer;
std::unique_ptr<CURL_PROGRESS> progress; std::unique_ptr<CURL_PROGRESS> progress;
std::shared_lock<std::shared_mutex> m_curlSharedLock;
}; };