ncurses 5.9 - patch 20120225

[ncurses.git] / ncurses / tinfo / comp_expand.c

diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index ef419d84cd2c66680449636a14b598efcb563261..5841baa656f1fb1267845de6ea038a3350cb3316 100644 (file)
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: comp_expand.c,v 1.18 2006/06/17 19:37:14 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.24 2012/02/22 22:40:24 tom Exp $")
 
 static int
 trailing_spaces(const char *src)
@@ -49,6 +49,8 @@ trailing_spaces(const char *src)
 #define REALCTL(s) (UChar(*(s)) < 127 && iscntrl(UChar(*(s))))
 #define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))
 
+#define P_LIMIT(p) (length - (size_t)(p))
+
 NCURSES_EXPORT(char *)
 _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 {
@@ -56,20 +58,20 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
     static size_t length;
 
     int bufp;
-    const char *str = VALID_STRING(srcp) ? srcp : "";
+    const char *str = VALID_STRING(srcp) ? srcp : "\0\0";
     bool islong = (strlen(str) > 3);
     size_t need = (2 + strlen(str)) * 4;
     int ch;
 
-#if NO_LEAKS
     if (srcp == 0) {
+#if NO_LEAKS
        if (buffer != 0) {
            FreeAndNull(buffer);
            length = 0;
        }
+#endif
        return 0;
     }
-#endif
     if (buffer == 0 || need > length) {
        if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
              return 0;
@@ -90,8 +92,9 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
                    && str[1] != '\\'
                    && REALPRINT(str + 1)
                    && str[2] == S_QUOTE) {
-                   sprintf(buffer + bufp, "{%d}", str[1]);
-                   bufp += strlen(buffer + bufp);
+                   _nc_SPRINTF(buffer + bufp, _nc_SLIMIT(P_LIMIT(bufp))
+                               "{%d}", str[1]);
+                   bufp += (int) strlen(buffer + bufp);
                    str += 2;
                } else {
                    buffer[bufp++] = *str;
@@ -119,7 +122,7 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
                        if (ch == '\\'
                            || ch == S_QUOTE)
                            buffer[bufp++] = '\\';
-                       buffer[bufp++] = ch;
+                       buffer[bufp++] = (char) ch;
                        buffer[bufp++] = S_QUOTE;
                        str = dst;
                    } else {
@@ -148,13 +151,13 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
            buffer[bufp++] = 's';
        } else if ((ch == ',' || ch == ':' || ch == '^') && tic_format) {
            buffer[bufp++] = '\\';
-           buffer[bufp++] = ch;
+           buffer[bufp++] = (char) ch;
        } else if (REALPRINT(str)
                   && (ch != ','
                       && ch != ':'
                       && !(ch == '!' && !tic_format)
                       && ch != '^'))
-           buffer[bufp++] = ch;
+           buffer[bufp++] = (char) ch;
 #if 0                          /* FIXME: this would be more readable (in fact the whole 'islong' logic should be removed) */
        else if (ch == '\b') {
            buffer[bufp++] = '\\';
@@ -177,10 +180,12 @@ _nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 #define UnCtl(c) ((c) + '@')
        else if (REALCTL(str) && ch != '\\'
                 && (!islong || isdigit(UChar(str[1])))) {
-           (void) sprintf(&buffer[bufp], "^%c", UnCtl(ch));
+           _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp))
+                       "^%c", UnCtl(ch));
            bufp += 2;
        } else {
-           (void) sprintf(&buffer[bufp], "\\%03o", ch);
+           _nc_SPRINTF(&buffer[bufp], _nc_SLIMIT(P_LIMIT(bufp))
+                       "\\%03o", ch);
            bufp += 4;
        }