macro.c:871 heap-buffer-overflow PR 32391 commit 9f2e3c21f6 fallout again. Also fix another 'macro' may be used uninitialized.