geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent hang when caller does not pass large enough buffer.

Browse Source
This commit is contained in:
Jim Norman
2006-09-29 22:22:26 +00:00
parent aa244fe2ab
commit c62ce742de
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CASA/micasacache/sscs_unx_ipc_client.c
View File

@@ -2268,22 +2268,21 @@ int32_t ipc_ReadBinaryKey
} }
else else
{ {
//buffer allocated by application is not sufficient to hold the data. //buffer allocated by application is not sufficient to hold the data.
*bytesRequired = dataLen; *bytesRequired = dataLen;
{ {
// Cleanup the channel by reading the remaining and return error. // Cleanup the channel by reading the remaining and return error.
int n; int n;
n = dataLen + MSG_DWORD_LEN; n = dataLen;
while(n) while(n)
{ {
int bytes = IPC_READ(ssHandle->platHandle, gpReplyBuf, MIN_REPLY_BUF_LEN); int bytesRead = IPC_READ(ssHandle->platHandle, gpReplyBuf, n);
if( bytes > 0) if( bytesRead > 0)
n -= bytes; n -= bytesRead;
else else
break; break;
} }
// Read the sscs return code also.
// IPC_READ(ssHandle->platHandle, (Byte *) &sockReturn, MSG_DWORD_LEN);
retCode = NSSCS_E_ENUM_BUFF_TOO_SHORT; retCode = NSSCS_E_ENUM_BUFF_TOO_SHORT;
break; break;
} }