Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from committags/n0.8.119fb7a5af97) Addresses CVE-2012-0848 Reviewed-by: Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Reinhard Tartler <siretart@tauware.de> (cherry picked from commit697a45d861) Signed-off-by: Reinhard Tartler <siretart@tauware.de>