Bug 887420 - Do not read off the end of the transfer map, r=Waldo

--HG--
extra : rebase_source : aae0289af6d58d9ff785afa959accc44342762ea