Don't trap on error for vsprintf() and friends
This commit is contained in:
parent
2ced6e28c3
commit
1118911981
@ -54,7 +54,7 @@ __fortify_vsprintf(char *s, const char *fmt, __builtin_va_list ap)
|
|||||||
|
|
||||||
if (bos != -1) {
|
if (bos != -1) {
|
||||||
r = vsnprintf(s, bos, fmt, ap);
|
r = vsnprintf(s, bos, fmt, ap);
|
||||||
if (r == -1 || (size_t)r >= bos)
|
if (r != -1 && (size_t)r >= bos)
|
||||||
__builtin_trap();
|
__builtin_trap();
|
||||||
} else {
|
} else {
|
||||||
r = vsprintf(s, fmt, ap);
|
r = vsprintf(s, fmt, ap);
|
||||||
@ -102,7 +102,7 @@ __fortify_vsnprintf(char *s, size_t n, const char *fmt, __builtin_va_list ap)
|
|||||||
int r; \
|
int r; \
|
||||||
if (bos != -1) { \
|
if (bos != -1) { \
|
||||||
r = (snprintf)(s, bos, fmt, ## __VA_ARGS__); \
|
r = (snprintf)(s, bos, fmt, ## __VA_ARGS__); \
|
||||||
if (r == -1 || (size_t)r >= bos) \
|
if (r != -1 && (size_t)r >= bos) \
|
||||||
__builtin_trap(); \
|
__builtin_trap(); \
|
||||||
} else { \
|
} else { \
|
||||||
r = (sprintf)(s, fmt, ## __VA_ARGS__); \
|
r = (sprintf)(s, fmt, ## __VA_ARGS__); \
|
||||||
|
Loading…
Reference in New Issue
Block a user