Commit a64953ed authored by unknown's avatar unknown
Browse files

testBasic -n MassiveRollback 

Make sure to not receive more that buffer can fit currently


ndb/src/common/transporter/TCP_Transporter.cpp:
  Make sure to not receive more that buffer can fit currently
parent 2de9ef17

ndb/src/common/transporter/TCP_Transporter.cpp

+43 −37
Original line number Diff line number Diff line
@@ -362,9 +362,12 @@ TCP_Transporter::doReceive() { 
  // Select-function must return the socket for read

  // before this method is called

  // It reads the external TCP/IP interface once

  

  int size = receiveBuffer.sizeOfBuffer - receiveBuffer.sizeOfData;

  if(size > 0){

    const int nBytesRead = recv(theSocket, 

                              receiveBuffer.insertPtr, maxReceiveSize, 0);

				receiveBuffer.insertPtr, 

				size < maxReceiveSize ? size : maxReceiveSize, 

				0);

    

    if (nBytesRead > 0) {

      receiveBuffer.sizeOfData += nBytesRead;
@@ -406,6 +409,9 @@ TCP_Transporter::doReceive() { 
      } 

    }

    return nBytesRead;

  } else {

    return 0;

  }

}



void