am 31f957bd: Merge "Fix buffer overflow security vulnerability (CVE-2014-9495)"

* commit '31f957bd40b2fd7ce44c5f83be20bc5f39ff9838':
  Fix buffer overflow security vulnerability (CVE-2014-9495)