D13917.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D13917.diff
View Options

	Index: head/stand/efi/libefi/efichar.c
	===================================================================
	--- head/stand/efi/libefi/efichar.c
	+++ head/stand/efi/libefi/efichar.c
	@@ -116,8 +116,10 @@

	if (len >= sz) {
	/* Absent bugs, we'll never return EOVERFLOW */
	- if (freeit)
	+ if (freeit) {
	free(*name);
	+ *name = NULL;
	+ }
	return (EOVERFLOW);
	}
	*cp++ = '\0';
	@@ -150,11 +152,8 @@
	*/
	if ((c & 0xc0) != 0x80) {
	/* Initial characters. */
	- if (bytes != 0) {
	- if (freeit)
	- free(nm);
	- return (EILSEQ);
	- }
	+ if (bytes != 0)
	+ goto ilseq;
	if ((c & 0xf8) == 0xf0) {
	ucs4 = c & 0x07;
	bytes = 3;
	@@ -173,29 +172,31 @@
	if (bytes > 0) {
	ucs4 = (ucs4 << 6) + (c & 0x3f);
	bytes--;
	- } else if (bytes == 0) {
	- if (freeit)
	- free(nm);
	- return (EILSEQ);
	- }
	+ } else if (bytes == 0)
	+ goto ilseq;
	}
	if (bytes == 0) {
	- if (ucs4 > 0xffff) {
	- if (freeit)
	- free(nm);
	- return (EILSEQ);
	- }
	+ if (ucs4 > 0xffff)
	+ goto ilseq;
	*nm++ = (efi_char)ucs4;
	sz -= 2;
	}
	}
	if (sz < 2) {
	- if (freeit)
	+ if (freeit) {
	free(nm);
	+ *nmp = NULL;
	+ }
	return (EDOOFUS);
	}
	sz -= 2;
	*nm = 0;
	*len -= sz;
	return (0);
	+ilseq:
	+ if (freeit) {
	+ free(nm);
	+ *nmp = NULL;
	+ }
	+ return (EILSEQ);
	}