Forks/privacore-open-source-search-engine
1
0
Fork 0
forked from Mirrors/privacore-open-source-search-engine
Code Pull Requests Activity

check number of bytes read before using read value in loadAddsInProgress (Msg4)

Browse Source
This commit is contained in:
Brian Rasmusson
2016-09-29 09:36:31 +02:00
parent 4e88b93270
commit 7d5b2a98cb
1 changed files with 11 additions and 4 deletions

15
Msg4.cpp

@ -1194,10 +1194,18 @@ bool loadAddsInProgress ( const char *prefix ) {
logTrace( g_conf.m_logTraceMsg4, "END - returning false" );
return false;
}
// host many bytes
int32_t numBytes;
read ( fd , (char *)&numBytes , 4 );
int32_t nb;
nb = (int32_t)read(fd, (char *)&numBytes, 4);
if ( nb != 4 ) {
close ( fd );
logError("Read of message size returned %" PRId32 " bytes instead of 4", nb);
logTrace( g_conf.m_logTraceMsg4, "END - returning false" );
return false;
}
p += 4;
// allocate buffer
char *buf = (char *)mmalloc ( numBytes , "msg4loadbuf");
if ( ! buf ) {
@ -1209,11 +1217,10 @@ bool loadAddsInProgress ( const char *prefix ) {
}
// the buffer
int32_t nb = read ( fd , buf , numBytes );
nb = (int32_t)read ( fd , buf , numBytes );
if ( nb != numBytes ) {
close ( fd );
log(LOG_ERROR,"%s:%s: build: bad msg4 buf read", __FILE__, __func__ );
logTrace( g_conf.m_logTraceMsg4, "END - returning false" );
return false;
}