[OS-BUILD PATCH] Workaround for gcc12 compile issues in ubcmd-util.h