Merge "msm:pproc: CPP freed pointer in error case"