svn commit: r285853 - releng/10.2/usr.sbin/pmcstudy

Ed Maste emaste at FreeBSD.org
Fri Jul 24 19:37:31 UTC 2015


Author: emaste
Date: Fri Jul 24 19:37:30 2015
New Revision: 285853
URL: https://svnweb.freebsd.org/changeset/base/285853

Log:
  MFS r285849: Fix minor errors found by coverity.
  
  PR:		201594
  Approved by:	re (gjb)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/10.2/usr.sbin/pmcstudy/pmcstudy.c
Directory Properties:
  releng/10.2/   (props changed)

Modified: releng/10.2/usr.sbin/pmcstudy/pmcstudy.c
==============================================================================
--- releng/10.2/usr.sbin/pmcstudy/pmcstudy.c	Fri Jul 24 19:26:06 2015	(r285852)
+++ releng/10.2/usr.sbin/pmcstudy/pmcstudy.c	Fri Jul 24 19:37:30 2015	(r285853)
@@ -1808,6 +1808,9 @@ process_file(char *filename)
 	if (cnts == NULL) {
 		/* Nothing we can do */
 		printf("Nothing to do -- no counters built\n");
+		if (io) {
+			fclose(io);
+		}
 		return;
 	}
 	lace_cpus_together();
@@ -2044,7 +2047,7 @@ get_cpuid_set(void)
 				printf("No memory3 allocation fails at startup?\n");	
 				exit(-1);
 			}
-			memset(more, sz, 0);
+			memset(more, 0, sz);
 			memcpy(more, valid_pmcs, sz);
 			pmc_allocated_cnt *= 2;
 			free(valid_pmcs);


More information about the svn-src-releng mailing list