Among other things, fixes CVE-2022-2566. Signed-off-by: Christopher Snowhill <kode54@gmail.com>
Update based on newest changes from upstream. Signed-off-by: Christopher Snowhill <kode54@gmail.com>