procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't abort in doprnt when passed unsupported %ll modifier.

Browse source 
src/doprnt.c (doprnt) [!HAVE_LONG_LONG_INT]: Error out instead of
 aborting when %lld or %lll format is passed.
 [!HAVE_UNSIGNED_LONG_LONG_INT]: Error out instead of aborting when
 %llo or %llx format is passed.  (Bug#8545)
This commit is contained in:
Eli Zaretskii 2011-04-29 22:34:06 +03:00
parent 03ab8921a8
commit ae940ccad1
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,5 +1,10 @@
2011-04-29 Eli Zaretskii <eliz@gnu.org>
* doprnt.c (doprnt) [!HAVE_LONG_LONG_INT]: Error out instead of
aborting when %lld or %lll format is passed.
[!HAVE_UNSIGNED_LONG_LONG_INT]: Error out instead of aborting when
%llo or %llx format is passed. (Bug#8545)
* window.c (window_scroll_line_based): Use a marker instead of
simple variables to record original value of point. (Bug#7952)

4
src/doprnt.c
View file

@ -269,7 +269,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
long long ll = va_arg (ap, long long);
sprintf (sprintf_buffer, fmtcpy, ll);
#else
abort ();
error ("Invalid format operation %%ll%c", fmt[-1]);
#endif
}
else if (long_flag)
@ -299,7 +299,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
unsigned long long ull = va_arg (ap, unsigned long long);
sprintf (sprintf_buffer, fmtcpy, ull);
#else
abort ();
error ("Invalid format operation %%ll%c", fmt[-1]);
#endif
}
else if (long_flag)