diff options
author | Eli Zaretskii <eliz@gnu.org> | 2011-04-29 22:34:06 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2011-04-29 22:34:06 +0300 |
commit | ae940ccad19a554e1134b7ae443716e46c72366d (patch) | |
tree | 4fa3f219e6657b4feb55740ba7e59ac701b18350 /src/doprnt.c | |
parent | 03ab8921a811be962c0fc0b6879fb59e08e7952c (diff) | |
download | emacs-ae940ccad19a554e1134b7ae443716e46c72366d.tar.gz |
Don't abort in doprnt when passed unsupported %ll modifier.
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)
Diffstat (limited to 'src/doprnt.c')
-rw-r--r-- | src/doprnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doprnt.c b/src/doprnt.c index 2508ddd831a..7b4bd35d5b1 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -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) |