MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-20 18:23:21 +00:00
Code Issues Releases Wiki Activity

Fixed edge case bug on Windows, where a Resume could result in ReadFile getting called before getOverlappedResult was called, corrupting the read buffer.

Browse Source
This commit is contained in:
Bryan Roe
2019-12-23 17:11:12 -08:00
parent c758c3ded9
commit 4998eb173f
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
microstack/ILibProcessPipe.c
View File

@@ -84,6 +84,7 @@ typedef struct ILibProcessPipe_PipeObject
HANDLE mPipe_ReadEnd; HANDLE mPipe_ReadEnd;
HANDLE mPipe_WriteEnd; HANDLE mPipe_WriteEnd;
OVERLAPPED *mOverlapped,*mwOverlapped; OVERLAPPED *mOverlapped,*mwOverlapped;
int inProgress;
void *mOverlapped_opaqueData, *user3, *user4; void *mOverlapped_opaqueData, *user3, *user4;
#else #else
int mPipe_ReadEnd, mPipe_WriteEnd; int mPipe_ReadEnd, mPipe_WriteEnd;
@@ -1058,6 +1059,7 @@ void ILibProcessPipe_Process_ReadHandler(void* user)
#ifdef WIN32 #ifdef WIN32
err = 0; err = 0;
result = GetOverlappedResult(pipeObject->mPipe_ReadEnd, pipeObject->mOverlapped, &bytesRead, FALSE); result = GetOverlappedResult(pipeObject->mPipe_ReadEnd, pipeObject->mOverlapped, &bytesRead, FALSE);
pipeObject->inProgress = 0;
//printf("Overlapped(%p): %d bytes\n", pipeObject->mPipe_ReadEnd, bytesRead); //printf("Overlapped(%p): %d bytes\n", pipeObject->mPipe_ReadEnd, bytesRead);
if (result == FALSE || bytesRead == 0) if (result == FALSE || bytesRead == 0)
{ {
@@ -1135,6 +1137,7 @@ void ILibProcessPipe_Process_ReadHandler(void* user)
#ifdef WIN32 #ifdef WIN32
if (pipeObject->PAUSED == 0) if (pipeObject->PAUSED == 0)
{ {
pipeObject->inProgress = 1;
if (ReadFile(pipeObject->mPipe_ReadEnd, pipeObject->buffer + pipeObject->readOffset + pipeObject->totalRead, pipeObject->bufferSize - pipeObject->totalRead, NULL, pipeObject->mOverlapped) != TRUE) if (ReadFile(pipeObject->mPipe_ReadEnd, pipeObject->buffer + pipeObject->readOffset + pipeObject->totalRead, pipeObject->bufferSize - pipeObject->totalRead, NULL, pipeObject->mOverlapped) != TRUE)
{ {
break; break;
@@ -1389,7 +1392,11 @@ void __stdcall ILibProcessPipe_Pipe_ResumeEx_APC(ULONG_PTR obj)
ILibProcessPipe_WaitHandle_Add(p->manager, p->mOverlapped->hEvent, p, ILibProcessPipe_Process_ReadHandler); ILibProcessPipe_WaitHandle_Add(p->manager, p->mOverlapped->hEvent, p, ILibProcessPipe_Process_ReadHandler);
} }
//printf("ReadFile(%p, %d, %d) (ResumeEx_APC)\n", p->mPipe_ReadEnd, p->readOffset + p->totalRead, p->bufferSize - p->readOffset - p->totalRead); //printf("ReadFile(%p, %d, %d) (ResumeEx_APC)\n", p->mPipe_ReadEnd, p->readOffset + p->totalRead, p->bufferSize - p->readOffset - p->totalRead);
ReadFile(p->mPipe_ReadEnd, p->buffer + p->readOffset + p->totalRead, p->bufferSize - p->readOffset - p->totalRead, NULL, p->mOverlapped); if (p->inProgress == 0)
{
p->inProgress = 1;
ReadFile(p->mPipe_ReadEnd, p->buffer + p->readOffset + p->totalRead, p->bufferSize - p->readOffset - p->totalRead, NULL, p->mOverlapped);
}
} }
else else
{ {
@@ -1528,6 +1535,7 @@ void ILibProcessPipe_Process_StartPipeReader(ILibProcessPipe_PipeObject *pipeObj
{ {
// This PIPE supports Overlapped I/O // This PIPE supports Overlapped I/O
//printf("ReadFile(%p, %d, %d) (StartPipeReader)\n", pipeObject->mPipe_ReadEnd, 0, pipeObject->bufferSize); //printf("ReadFile(%p, %d, %d) (StartPipeReader)\n", pipeObject->mPipe_ReadEnd, 0, pipeObject->bufferSize);
pipeObject->inProgress = 1;
result = ReadFile(pipeObject->mPipe_ReadEnd, pipeObject->buffer, pipeObject->bufferSize, NULL, pipeObject->mOverlapped); result = ReadFile(pipeObject->mPipe_ReadEnd, pipeObject->buffer, pipeObject->bufferSize, NULL, pipeObject->mOverlapped);
ILibProcessPipe_WaitHandle_Add(pipeObject->manager, pipeObject->mOverlapped->hEvent, pipeObject, &ILibProcessPipe_Process_ReadHandler); ILibProcessPipe_WaitHandle_Add(pipeObject->manager, pipeObject->mOverlapped->hEvent, pipeObject, &ILibProcessPipe_Process_ReadHandler);
} }