修正一处安全隐患
Merge remote-tracking branch 'upstream/master'