diff options
Diffstat (limited to 'ncurses/base/safe_sprintf.c')
| -rw-r--r-- | ncurses/base/safe_sprintf.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c index 34abd2f..1868c00 100644 --- a/ncurses/base/safe_sprintf.c +++ b/ncurses/base/safe_sprintf.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc. * + * Copyright 2018,2020 Thomas E. Dickey * + * Copyright 1998-2012,2013 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -33,7 +34,7 @@ #include <curses.priv.h> #include <ctype.h> -MODULE_ID("$Id: safe_sprintf.c,v 1.27 2013/01/20 01:04:32 tom Exp $") +MODULE_ID("$Id: safe_sprintf.c,v 1.33 2020/02/02 23:34:34 tom Exp $") #if USE_SAFE_SPRINTF @@ -41,7 +42,7 @@ typedef enum { Flags, Width, Prec, Type, Format } PRINTF; -#define VA_INTGR(type) ival = va_arg(ap, type) +#define VA_INTGR(type) ival = (int) va_arg(ap, type) #define VA_FLOAT(type) fval = va_arg(ap, type) #define VA_POINT(type) pval = (void *)va_arg(ap, type) @@ -157,9 +158,9 @@ _nc_printf_length(const char *fmt, va_list ap) case 's': VA_POINT(char *); if (prec < 0) - prec = strlen(pval); + prec = (int) strlen(pval); if (prec > (int) length) { - length = length + prec; + length = length + (size_t) prec; buffer = typeRealloc(char, length, buffer); if (buffer == 0) { free(format); @@ -224,7 +225,7 @@ NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx { char *result = 0; - if (fmt != 0) { + if (SP_PARM != 0 && fmt != 0) { #if USE_SAFE_SPRINTF va_list ap2; int len; @@ -234,7 +235,7 @@ NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx end_va_copy(ap2); if ((int) my_length < len + 1) { - my_length = 2 * (len + 1); + my_length = (size_t) (2 * (len + 1)); my_buffer = typeRealloc(char, my_length, my_buffer); } if (my_buffer != 0) { @@ -259,9 +260,9 @@ NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx if (my_buffer != 0) { # if HAVE_VSNPRINTF - vsnprintf(my_buffer, my_length, fmt, ap); /* GNU extension */ + vsnprintf(my_buffer, my_length, fmt, ap); /* SUSv2, 1997 */ # else - vsprintf(my_buffer, fmt, ap); /* ANSI */ + vsprintf(my_buffer, fmt, ap); /* ISO/ANSI C, 1989 */ # endif result = my_buffer; } |