Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch

2010-07-01 10:41:59 -07:00 · 2010-07-01 10:41:59 -07:00 · 049a26b800
parent c102394c69 3b54f5030e
commit 049a26b800
1 changed files with 2 additions and 1 deletions
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@ -5452,7 +5452,8 @@ main(int argc, char **argv)
 	process_options(argc, argv);

 	/* Override location of zpool.cache */
-	(void) asprintf((char **)&spa_config_path, "%s/zpool.cache", zopt_dir);
+	VERIFY(asprintf((char **)&spa_config_path, "%s/zpool.cache",
+	    zopt_dir) != -1);

 	/*
 	 * Blow away any existing copy of zpool.cache