epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ipAddrToAsciiGlobal::run() keep scratch buffer as local

Browse Source
This commit is contained in:
Michael Davidsaver
2023-12-22 10:26:28 -08:00
parent ea8247586f
commit 823386573f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
+6 -5
View File
@@ -17,6 +17,7 @@
#include <climits>
#include <stdexcept>
#include <cstdio>
#include <vector>
//#define EPICS_FREELIST_DEBUG
#define EPICS_PRIVATE_API
@@ -82,7 +83,6 @@ struct ipAddrToAsciiGlobal : public epicsThreadRunable {
virtual void run ();
char nameTmp [1024];
tsFreeList
< ipAddrToAsciiTransactionPrivate, 0x80 >
transactionFreeList;
@@ -297,6 +297,8 @@ ipAddrToAsciiTransaction & ipAddrToAsciiEnginePrivate::createTransaction ()
void ipAddrToAsciiGlobal::run ()
{
std::vector<char> nameTmp(1024);
epicsGuard < epicsMutex > guard ( this->mutex );
while ( ! this->exitFlag ) {
{
@@ -313,14 +315,13 @@ void ipAddrToAsciiGlobal::run ()
if ( this->exitFlag )
{
sockAddrToDottedIP ( & addr.sa, this->nameTmp,
sizeof ( this->nameTmp ) );
sockAddrToDottedIP ( & addr.sa, &nameTmp[0], nameTmp.size() );
}
else {
epicsGuardRelease < epicsMutex > unguard ( guard );
// depending on DNS configuration, this could take a very long time
// so we release the lock
sockAddrToA ( &addr.sa, this->nameTmp, sizeof ( this->nameTmp ) );
sockAddrToA ( &addr.sa, &nameTmp[0], nameTmp.size() );
}
// the ipAddrToAsciiTransactionPrivate destructor is allowed to
@@ -339,7 +340,7 @@ void ipAddrToAsciiGlobal::run ()
{
epicsGuardRelease < epicsMutex > unguard ( guard );
// don't call callback with lock applied
pCur->pCB->transactionComplete ( this->nameTmp );
pCur->pCB->transactionComplete ( &nameTmp[0] );
}
this->callbackInProgress = false;