Merge change 23852 into eclair

* changes:
  Fix a call to memset(3) with reversed arguments.