dd6004e Fix brain-o. Copy the directory, not what we just tested to be a NULL pointer. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix brain-o. Copy the directory, not what we just tested to be a NULL pointer.

Matthew Seaman committed 13 years ago

commit dd6004eb9fa4eb81e9071e667019894815d8e194
parent a9e4b39

1 file changed +2 -2

modified libpkg/pkgdb.c

@@ -728,7 +728,7 @@ file_mode_insecure(const char *path, bool install_as_user)

 	if ( (sb.st_mode & S_IWOTH) != 0  ||
 	     ((euid == 0 || sb.st_gid != egid) &&
 	      (sb.st_mode & S_IWGRP) != 0)) {
 		pkg_emit_error("%s: permissions (%#o) too lax", path,
 		pkg_emit_error("%s permissions (%#o) too lax", path,
 			       (sb.st_mode & (S_IRWXU|S_IRWXG|S_IRWXO)));
 		return (EPKG_INSECURE);
 	}

@@ -749,7 +749,7 @@ database_access(unsigned mode, const char* dbdir, const char *dbname)

 		snprintf(dbpath, sizeof(dbpath), "%s/%s.sqlite", dbdir,
 			 dbname);
 	else
 		strlcpy(dbpath, dbname, sizeof(dbpath));
 		strlcpy(dbpath, dbdir, sizeof(dbpath));
 	install_as_user = (getenv("INSTALL_AS_USER") != NULL);