am 8cd12112: am d51bfc9b: Merge "Fix the potential segmentation fault"

* commit '8cd12112e444e01163526fe6ab237f6164b0018b':
  Fix the potential segmentation fault