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