Re: bugifx: fix some wrong usage of ATTRIBUTE_NONNULL