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

--HG--
extra : rebase_source : 6ef2b3017888286447135816e734c98bb6cf3da9