fd and oldcorr were not cleaned up before returning. BUG: 385894 FIXED-IN: 5.21.3 (cherry picked from commit 8a7afcb7)