D58555.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D58555.diff
View Options

	diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
	--- a/usr.sbin/ppp/mp.c
	+++ b/usr.sbin/ppp/mp.c
	@@ -931,10 +931,10 @@
	case ENDDISC_MAGIC:
	sprintf(result, "Magic: 0x");
	header = strlen(result);
	- if (len + header + 1 > sizeof result)
	- len = sizeof result - header - 1;
	+ if (2 * len + header + 1 > sizeof result)
	+ len = (sizeof result - header - 1) / 2;
	for (f = 0; f < len; f++)
	- sprintf(result + header + 2 * f, "%02x", address[f]);
	+ sprintf(result + header + 2 * f, "%02x", (unsigned char)address[f]);
	break;

	case ENDDISC_PSN:
	@@ -944,10 +944,10 @@
	default:
	sprintf(result, "%d: ", (int)c);
	header = strlen(result);
	- if (len + header + 1 > sizeof result)
	- len = sizeof result - header - 1;
	+ if (2 * len + header + 1 > sizeof result)
	+ len = (sizeof result - header - 1) / 2;
	for (f = 0; f < len; f++)
	- sprintf(result + header + 2 * f, "%02x", address[f]);
	+ sprintf(result + header + 2 * f, "%02x", (unsigned char)address[f]);
	break;
	}
	return result;