Fully address CVE-2021-3121 in the process.
To fix CVE-2020-14040.
Signed-off-by: prateekpandey14 <prateekpandey14@gmail.com>