Merge "Revert "Revert "msm: mpm-of: Fix NULL pointer and buffer overflow errors"""