===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/nm/elf.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/usr.bin/nm/elf.c	2015/06/23 15:13:29	1.31
+++ src/usr.bin/nm/elf.c	2015/06/23 15:16:34	1.32
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elf.c,v 1.31 2015/06/23 15:13:29 semarie Exp $	*/
+/*	$OpenBSD: elf.c,v 1.32 2015/06/23 15:16:34 semarie Exp $	*/
 
 /*
  * Copyright (c) 2003 Michael Shalayeff
@@ -498,6 +498,7 @@
 				warn("%s: malloc names", name);
 				if (stab)
 					MUNMAP(stab, *pstabsize);
+				*pnrawnames = 0;
 				return (1);
 			}
 			if ((*psnames = calloc(*pnrawnames, sizeof(np))) == NULL) {
@@ -505,6 +506,8 @@
 				if (stab)
 					MUNMAP(stab, *pstabsize);
 				free(*pnames);
+				*pnames = NULL;
+				*pnrawnames = 0;
 				return (1);
 			}
 
@@ -516,6 +519,9 @@
 						MUNMAP(stab, *pstabsize);
 					free(*pnames);
 					free(*psnames);
+					*pnames = NULL;
+					*psnames = NULL;
+					*pnrawnames = 0;
 					return (1);
 				}