Fix a merge problem in which name_from_addr returned pointers to the stack; found by Jiang Hong. svn:r934