Merge "mem_map_test: perform null check before dereferencing a pointer."
am: ecfd0df971

* commit 'ecfd0df971c538456887866307c007c8b0a25470':
  mem_map_test: perform null check before dereferencing a pointer.