[5.0] avoid using a stack variable after return

[5.0] avoid using a stack variable after return #6324