D23159.diff
No OneTemporary
Actions

Size

718 B

Referenced Files

None

Subscribers

None

D23159.diff
View Options

	Index: head/usr.sbin/fstyp/hammer.c
	===================================================================
	--- head/usr.sbin/fstyp/hammer.c
	+++ head/usr.sbin/fstyp/hammer.c
	@@ -76,7 +76,7 @@
	assert(count != 0);
	memcpy(&fsid, &ondisk->vol_fsid, sizeof(fsid));
	memcpy(&fstype, &ondisk->vol_fstype, sizeof(fstype));
	- strncpy(label, ondisk->vol_label, sizeof(label));
	+ strlcpy(label, ondisk->vol_label, sizeof(label));
	} else {
	if (ondisk->vol_count != count)
	return (5);
	@@ -84,7 +84,7 @@
	return (6);
	if (memcmp(&ondisk->vol_fstype, &fstype, sizeof(fstype)))
	return (7);
	- if (strncmp(ondisk->vol_label, label, sizeof(label)))
	+ if (strcmp(ondisk->vol_label, label))
	return (8);
	}