atmos
/
fortify-headers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-order vsnprintf() and vsprintf() 

vsprintf() needs to access __vsnprintf_orig().
This commit is contained in:
sin 2015-03-13 14:22:41 +00:00
parent 2b6657b759
commit c2b0ad0bf5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/stdio.h
View File

@ -54,6 +54,18 @@ size_t fwrite(const void *dst, size_t n, size_t nmemb, FILE *fp)
return __fwrite_orig(dst, n, nmemb, fp);
}
extern int __vsnprintf_orig(char *, size_t, const char *, __builtin_va_list)
__asm__(__USER_LABEL_PREFIX__ "vsnprintf");
extern __inline __attribute__((__always_inline__,__gnu_inline__))
int vsnprintf(char *s, size_t n, const char *fmt, __builtin_va_list ap)
{
size_t bos = __builtin_object_size(s, 0);
if (n > bos)
__builtin_trap();
return __vsnprintf_orig(s, n, fmt, ap);
}
extern int __vsprintf_orig(char *, const char *, __builtin_va_list)
__asm__(__USER_LABEL_PREFIX__ "vsprintf");
extern __inline __attribute__((__always_inline__,__gnu_inline__))
@ -72,18 +84,6 @@ int vsprintf(char *s, const char *fmt, __builtin_va_list ap)
return r;
}
extern int __vsnprintf_orig(char *, size_t, const char *, __builtin_va_list)
__asm__(__USER_LABEL_PREFIX__ "vsnprintf");
extern __inline __attribute__((__always_inline__,__gnu_inline__))
int vsnprintf(char *s, size_t n, const char *fmt, __builtin_va_list ap)
{
size_t bos = __builtin_object_size(s, 0);
if (n > bos)
__builtin_trap();
return __vsnprintf_orig(s, n, fmt, ap);
}
#undef snprintf
#define snprintf(s, n, fmt, ...) ({ \
size_t _n = n; \