Merge "fix compiler error under FORTIFY_SOURCE=2"