54b7559f87
Applies only the relevant code changes, as the test changes don't apply cleanly. Fixes: CVE-2023-5217
Applies only the relevant code changes, as the test changes don't apply cleanly. Fixes: CVE-2023-5217