Changeset View

Standalone View

	--- muttlib.c.orig 2017-04-19 01:05:29 UTC			--- muttlib.c.orig 2017-06-03 02:20:37 UTC
	+++ muttlib.c			+++ muttlib.c
	@@ -1369,6 +1369,12 @@			@@ -1378,6 +1378,12 @@ void mutt_FormatString (char dest, /
	count = 0;			count = 0;
	while (count < sizeof (ifstring) && src && src != '?' && *src != '&')			while (count < sizeof (ifstring) && src && src != '?' && *src != '&')
	{			{
	+ if (*src == '\\')			+ if (*src == '\\')
	+ {			+ {
	+ src++;			+ src++;
	+ if (!*src)			+ if (!*src)
	+ break;			+ break;
	+ }			+ }
	cp++ = src++;			cp++ = src++;
	count++;			count++;
	}			}
	@@ -1381,7 +1387,13 @@			@@ -1390,7 +1396,13 @@ void mutt_FormatString (char dest, /
	count = 0;			count = 0;
	while (count < sizeof (elsestring) && src && src != '?')			while (count < sizeof (elsestring) && src && src != '?')
	{			{
	- cp++ = src++;			- cp++ = src++;
	+ if (*src == '\\')			+ if (*src == '\\')
	+ {			+ {
	+ src++;			+ src++;
	+ if (!*src)			+ if (!*src)
	+ break;			+ break;
	+ }			+ }
	+ cp++ = src++;			+ cp++ = src++;
	count++;			count++;
	}			}
	*cp = 0;			*cp = 0;