[3.20] community/heimdall: backport patch from v2.1.0 to fix segfault

Heimdall was updated to 2.1.0 recently.

This MR backports one of the commits to fix a segmentation fault when a certain combination of options are used.