Fixed goto into scope.

Two functions contained goto statements entering the scope of
automatic variables; added explicit blocks to limit these scopes.

Change-Id: Ib2d46bdc235089e208ac70bdaf405ea9e5b91ab1
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
Author: Kevin Schoedel <kevin.p.schoedel@intel.com>