[PATCH] util: fix non-null pointer parameter annotations