[PATCH v3 0/2] MR1774: Coverity fixes