Fix possible memory leak.
Merge branch 'rfc5054_compat' into two

* rfc5054_compat:
  Fix possible memory leak.