update to GMTIME_THREAD_SAFE, also lock around increment in callback

awslabs · Jan 29, 2024 · a65fd5e · a65fd5e
1 parent f7dd651
commit a65fd5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/source/Common/AwsV4Signer.c b/src/source/Common/AwsV4Signer.c
@@ -659,7 +659,7 @@ STATUS generateSignatureDateTime(UINT64 currentTime, PCHAR pDateTimeStr)
 
     // Convert to time_t
     timeT = (time_t) (currentTime / HUNDREDS_OF_NANOS_IN_A_SECOND);
-    retSize = STRFTIME(pDateTimeStr, SIGNATURE_DATE_TIME_STRING_LEN, DATE_TIME_STRING_FORMAT, GMTIME_SAFE(&timeT));
+    retSize = STRFTIME(pDateTimeStr, SIGNATURE_DATE_TIME_STRING_LEN, DATE_TIME_STRING_FORMAT, GMTIME_THREAD_SAFE(&timeT));
     CHK(retSize > 0, STATUS_BUFFER_TOO_SMALL);
     pDateTimeStr[retSize] = '\0';
 

diff --git a/tst/ProducerTestFixture.cpp b/tst/ProducerTestFixture.cpp
@@ -691,10 +691,10 @@ STATUS ProducerClientTestBase::curlReadCallbackHookFunc(PCurlResponse pCurlRespo
 
 STATUS ProducerClientTestBase::testFreeApiCallbackFunc(PUINT64 customData)
 {
-    ProducerClientTestBase* pTestBase = (ProducerClientTestBase*) *customData;
-
-    pTestBase->mFreeApiCallbacksFnCount++;
-
+    ProducerClientTestBase* pTest = (ProducerClientTestBase*) *customData;
+    MUTEX_LOCK(pTest->mTestCallbackLock);
+    pTest->mFreeApiCallbacksFnCount++;
+    MUTEX_UNLOCK(pTest->mTestCallbackLock);
     return STATUS_SUCCESS;
 }