ncurses 6.1 - patch 20191221

[ncurses.git] / ncurses / base / safe_sprintf.c

diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c
index 9cea066ca24c81f558a8aa52041bb6b65efc7e65..e41da4ac27d173e7cf203f44fc5f0015d6789cf0 100644 (file)
--- a/ncurses/base/safe_sprintf.c
+++ b/ncurses/base/safe_sprintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2018 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            *
@@ -27,13 +27,13 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
+ *  Author: Thomas E. Dickey        1997-on                                 *
  ****************************************************************************/
 
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: safe_sprintf.c,v 1.26 2012/02/22 22:40:24 tom Exp $")
+MODULE_ID("$Id: safe_sprintf.c,v 1.32 2018/12/15 22:26:38 tom Exp $")
 
 #if USE_SAFE_SPRINTF
 
@@ -41,7 +41,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)
 
@@ -114,6 +114,7 @@ _nc_printf_length(const char *fmt, va_list ap)
                                "%d", ival);
                    fmt_len += strlen(fmt_arg);
                    if ((format = _nc_doalloc(format, fmt_len)) == 0) {
+                       free(buffer);
                        return -1;
                    }
                    --f;
@@ -156,9 +157,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);
@@ -223,7 +224,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;
@@ -233,7 +234,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) {
@@ -258,9 +259,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;
        }