[Matahari] [PATCH] Resolve errors reported by coverity.