d0d0771 Include upstream commit 4523e145 for CVE-2012-2390

Authored and Committed by jwboyer 11 years ago
    Include upstream commit 4523e145 for CVE-2012-2390
    
    This fixes an oops that was trivially triggered after the original commit
    went in.  Props to Dave J.