Bug 939464 - Rewrite code to fix GCC unitialized variable compliants. r=billm

--HG--
extra : amend_source : 8a8629b2781c2e02e031d190dae3d2db33ab6d79