D3991.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3991.diff
View Options

	Index: head/sbin/savecore/savecore.c
	===================================================================
	--- head/sbin/savecore/savecore.c
	+++ head/sbin/savecore/savecore.c
	@@ -606,7 +606,8 @@
	}

	if (kdhl.panicstring[0])
	- syslog(LOG_ALERT, "reboot after panic: %s", kdhl.panicstring);
	+ syslog(LOG_ALERT, "reboot after panic: %*s",
	+ (int)sizeof(kdhl.panicstring), kdhl.panicstring);
	else
	syslog(LOG_ALERT, "reboot");

	@@ -657,7 +658,7 @@
	if (info == NULL) {
	syslog(LOG_ERR, "fdopen failed: %m");
	nerr++;
	- goto closefd;
	+ goto closeall;
	}

	xostyle = xo_get_style(NULL);
	@@ -665,7 +666,7 @@
	if (xoinfo == NULL) {
	syslog(LOG_ERR, "%s: %m", infoname);
	nerr++;
	- goto closefd;
	+ goto closeall;
	}
	xo_open_container_h(xoinfo, "crashdump");

	@@ -726,9 +727,8 @@
	if (verbose)
	printf("clearing dump header\n");
	memcpy(kdhl.magic, KERNELDUMPMAGIC_CLEARED, sizeof kdhl.magic);
	- lseek(fd, lasthd, SEEK_SET);
	- error = write(fd, &kdhl, sizeof kdhl);
	- if (error != sizeof kdhl)
	+ if (lseek(fd, lasthd, SEEK_SET) != lasthd \|\|
	+ write(fd, &kdhl, sizeof(kdhl)) != sizeof(kdhl))
	syslog(LOG_ERR,
	"error while clearing the dump header: %m");
	}