ncurses 6.2 - patch 20200912

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

diff --git a/ncurses/base/safe_sprintf.c b/ncurses/base/safe_sprintf.c
index 81fe44f0c783d6945e0618af7eee095d0ea8914a..1868c009660c37751f3c50153a1b7fead64e5f41 100644 (file)
--- a/ncurses/base/safe_sprintf.c
+++ b/ncurses/base/safe_sprintf.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2003 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            *
@@ -27,13 +28,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.18 2003/08/09 21:52:04 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)
 
@@ -109,12 +110,16 @@ _nc_printf_length(const char *fmt, va_list ap)
                    } else if (state == Prec) {
                        prec = ival;
                    }
-                   sprintf(fmt_arg, "%d", ival);
+                   _nc_SPRINTF(fmt_arg,
+                               _nc_SLIMIT(sizeof(fmt_arg))
+                               "%d", ival);
                    fmt_len += strlen(fmt_arg);
-                   if ((format = realloc(format, fmt_len)) == 0) {
+                   if ((format = _nc_doalloc(format, fmt_len)) == 0) {
+                       free(buffer);
                        return -1;
                    }
-                   strcpy(&format[--f], fmt_arg);
+                   --f;
+                   _nc_STRCPY(&format[f], fmt_arg, fmt_len - f);
                    f = strlen(format);
                } else if (isalpha(UChar(*fmt))) {
                    done = TRUE;
@@ -153,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);
@@ -185,13 +190,13 @@ _nc_printf_length(const char *fmt, va_list ap)
            format[f] = '\0';
            switch (used) {
            case 'i':
-               sprintf(buffer, format, ival);
+               _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, ival);
                break;
            case 'f':
-               sprintf(buffer, format, fval);
+               _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, fval);
                break;
            default:
-               sprintf(buffer, format, pval);
+               _nc_SPRINTF(buffer, _nc_SLIMIT(length) format, pval);
                break;
            }
            len += (int) strlen(buffer);
@@ -207,56 +212,73 @@ _nc_printf_length(const char *fmt, va_list ap)
 }
 #endif
 
+#define my_buffer _nc_globals.safeprint_buf
+#define my_length _nc_globals.safeprint_used
+
 /*
  * Wrapper for vsprintf that allocates a buffer big enough to hold the result.
  */
 NCURSES_EXPORT(char *)
-_nc_printf_string(const char *fmt, va_list ap)
+NCURSES_SP_NAME(_nc_printf_string) (NCURSES_SP_DCLx
+                                   const char *fmt,
+                                   va_list ap)
 {
-    static char *buf;
-    static size_t used;
     char *result = 0;
 
-    if (fmt != 0) {
+    if (SP_PARM != 0 && fmt != 0) {
 #if USE_SAFE_SPRINTF
-       int len = _nc_printf_length(fmt, ap);
+       va_list ap2;
+       int len;
+
+       begin_va_copy(ap2, ap);
+       len = _nc_printf_length(fmt, ap2);
+       end_va_copy(ap2);
 
-       if ((int) used < len + 1) {
-           used = 2 * (len + 1);
-           buf = typeRealloc(char, used, buf);
+       if ((int) my_length < len + 1) {
+           my_length = (size_t) (2 * (len + 1));
+           my_buffer = typeRealloc(char, my_length, my_buffer);
        }
-       if (buf != 0) {
-           *buf = '\0';
+       if (my_buffer != 0) {
+           *my_buffer = '\0';
            if (len >= 0) {
-               vsprintf(buf, fmt, ap);
+               vsprintf(my_buffer, fmt, ap);
            }
-           result = buf;
+           result = my_buffer;
        }
 #else
-       static int rows, cols;
+#define MyCols _nc_globals.safeprint_cols
+#define MyRows _nc_globals.safeprint_rows
 
-       if (screen_lines > rows || screen_columns > cols) {
-           if (screen_lines > rows)
-               rows = screen_lines;
-           if (screen_columns > cols)
-               cols = screen_columns;
-           used = (rows * (cols + 1)) + 1;
-           buf = typeRealloc(char, used, buf);
+       if (screen_lines(SP_PARM) > MyRows || screen_columns(SP_PARM) > MyCols) {
+           if (screen_lines(SP_PARM) > MyRows)
+               MyRows = screen_lines(SP_PARM);
+           if (screen_columns(SP_PARM) > MyCols)
+               MyCols = screen_columns(SP_PARM);
+           my_length = (size_t) (MyRows * (MyCols + 1)) + 1;
+           my_buffer = typeRealloc(char, my_length, my_buffer);
        }
 
-       if (buf != 0) {
+       if (my_buffer != 0) {
 # if HAVE_VSNPRINTF
-           vsnprintf(buf, used, fmt, ap);      /* GNU extension */
+           vsnprintf(my_buffer, my_length, fmt, ap);   /* SUSv2, 1997 */
 # else
-           vsprintf(buf, fmt, ap);     /* ANSI */
+           vsprintf(my_buffer, fmt, ap);       /* ISO/ANSI C, 1989 */
 # endif
-           result = buf;
+           result = my_buffer;
        }
 #endif
-    } else if (buf != 0) {     /* see _nc_freeall() */
-       free(buf);
-       buf = 0;
-       used = 0;
+    } else if (my_buffer != 0) {       /* see _nc_freeall() */
+       free(my_buffer);
+       my_buffer = 0;
+       my_length = 0;
     }
     return result;
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(char *)
+_nc_printf_string(const char *fmt, va_list ap)
+{
+    return NCURSES_SP_NAME(_nc_printf_string) (CURRENT_SCREEN, fmt, ap);
+}
+#endif