On the extension of Vaidya and Vaidya-Reissner-Nordström spacetimes