A recent batch of coverity fixes by Chris Leech includes a fix for this issue, so instead of providing a fix with just my fix, I will soon provide a test rpm that includes all of the coverity fixes.