Merge pull request #4593 from gilles-peskine-arm/remove-duplicated-ASSERT_ALLOC-2.x

Backport 2.x: Fix null pointer arithmetic in NIST_KW