20 years worth of baptisms invalidated

Question for the Catholics here,

Do you believe that those that got the baptisms and have since died will spend an eternity in Hell now?
I'm trying to remember the rule now. In the past, we were taught about Limbo as a place in between Heaven and Hell where the unbaptized went. It was then revised to include those who suffered from mental illness who committed suicide. In Limbo, the Church says that those souls still have an opportunity at full salvation, but even that wasn't always the case.

As a Catholic, this would piss me off seriously if I had been in that number. I'm reading the story out of Detroit about a priest who saw a video of his baptism to find out that the wrong words were used and his baptism AND ordination were invalid. Not only that, but all of his masses, every consecration of the host, every wedding and last rites, every absolved sin have all been invalidated. The only thing the Church is letting stand are the baptisms he conducted.

I'd be pissed.