gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vsnprintf: reject POSTK_DEBUG_TEMP_FIX_28 return value fix

Browse Source 
Change-Id: I23beeca094e1b0ee84211f3ed4c33ef7e2aa62c2
This commit is contained in:
Dominique Martinet
2019-01-30 13:28:05 +09:00
parent 3c1fd54a92
commit ad8a3ae962
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/vsprintf.c
View File

@@ -905,19 +905,12 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
char *str, *end, c; char *str, *end, c;
int read; int read;
struct printf_spec spec = {0}; struct printf_spec spec = {0};
#ifdef POSTK_DEBUG_TEMP_FIX_28 /* vsnprintf size excess return value fix. */
int ret = 0;
#endif /* POSTK_DEBUG_TEMP_FIX_28 */
/* Reject out-of-range values early. Large positive sizes are /* Reject out-of-range values early. Large positive sizes are
used for unknown buffer sizes. */ used for unknown buffer sizes. */
if (unlikely((int) size < 0)) { if (unlikely((int) size < 0)) {
/* There can be only one.. */ /* There can be only one.. */
#ifdef POSTK_DEBUG_TEMP_FIX_28 /* vsnprintf size excess return value fix. */
return ret;
#else /* POSTK_DEBUG_TEMP_FIX_28 */
return 0; return 0;
#endif /* POSTK_DEBUG_TEMP_FIX_28 */
} }
str = buf; str = buf;
@@ -1065,29 +1058,14 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
} }
if (size > 0) { if (size > 0) {
#ifdef POSTK_DEBUG_TEMP_FIX_28 /* vsnprintf size excess return value fix. */
if (str < end) {
*str = '\0';
ret = str - buf;
}
else {
end[-1] = '\0';
ret = end - buf - 1;
}
#else /* POSTK_DEBUG_TEMP_FIX_28 */
if (str < end) if (str < end)
*str = '\0'; *str = '\0';
else else
end[-1] = '\0'; end[-1] = '\0';
#endif /* POSTK_DEBUG_TEMP_FIX_28 */
} }
/* the trailing null byte doesn't count towards the total */ /* the trailing null byte doesn't count towards the total */
#ifdef POSTK_DEBUG_TEMP_FIX_28 /* vsnprintf size excess return value fix. */
return ret;
#else /* POSTK_DEBUG_TEMP_FIX_28 */
return str-buf; return str-buf;
#endif /* POSTK_DEBUG_TEMP_FIX_28 */
} }
EXPORT_SYMBOL(vsnprintf); EXPORT_SYMBOL(vsnprintf);