D6467.id16909.diff
No OneTemporary
Actions

Size

970 B

Referenced Files

None

Subscribers

None

D6467.id16909.diff
View Options

	Index: head/usr.bin/ar/write.c
	===================================================================
	--- head/usr.bin/ar/write.c
	+++ head/usr.bin/ar/write.c
	@@ -124,6 +124,7 @@
	struct ar_obj *obj;
	struct stat sb;
	const char *bname;
	+ char *tmpname;

	if (name == NULL)
	return (NULL);
	@@ -137,7 +138,10 @@
	return (NULL);
	}

	- if ((bname = basename(name)) == NULL)
	+ tmpname = strdup(name);
	+ if (tmpname == NULL)
	+ bsdar_errc(bsdar, EX_SOFTWARE, errno, "strdup failed");
	+ if ((bname = basename(tmpname)) == NULL)
	bsdar_errc(bsdar, EX_SOFTWARE, errno, "basename failed");
	if (bsdar->options & AR_TR && strlen(bname) > _TRUNCATE_LEN) {
	if ((obj->name = malloc(_TRUNCATE_LEN + 1)) == NULL)
	@@ -147,6 +151,7 @@
	} else
	if ((obj->name = strdup(bname)) == NULL)
	bsdar_errc(bsdar, EX_SOFTWARE, errno, "strdup failed");
	+ free(tmpname);

	if (fstat(obj->fd, &sb) < 0) {
	bsdar_warnc(bsdar, errno, "can't fstat file: %s", obj->name);