Merge change Ica2d0b8c

* changes:
  Fix a buffer overrun in OSNetworkSystem.