ncurses 5.7 - patch 20090728

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

diff --git a/ncurses/tinfo/comp_expand.c b/ncurses/tinfo/comp_expand.c
index 7ba438aff8e265346f480ce9e998605a329e69cd..6e79a926b5ac59f33d738523676a3cf654c93449 100644 (file)
--- a/ncurses/tinfo/comp_expand.c
+++ b/ncurses/tinfo/comp_expand.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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.17 2001/09/22 19:16:52 tom Exp $")
+MODULE_ID("$Id: comp_expand.c,v 1.20 2008/08/16 19:29:42 tom Exp $")
 
 static int
 trailing_spaces(const char *src)
@@ -50,18 +50,26 @@ trailing_spaces(const char *src)
 #define REALPRINT(s) (UChar(*(s)) < 127 && isprint(UChar(*(s))))
 
 NCURSES_EXPORT(char *)
-_nc_tic_expand
-(const char *srcp, bool tic_format, int numbers)
+_nc_tic_expand(const char *srcp, bool tic_format, int numbers)
 {
     static char *buffer;
     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 (buffer != 0) {
+           FreeAndNull(buffer);
+           length = 0;
+       }
+       return 0;
+    }
+#endif
     if (buffer == 0 || need > length) {
        if ((buffer = typeRealloc(char, length = need, buffer)) == 0)
              return 0;
@@ -111,7 +119,7 @@ _nc_tic_expand
                        if (ch == '\\'
                            || ch == S_QUOTE)
                            buffer[bufp++] = '\\';
-                       buffer[bufp++] = ch;
+                       buffer[bufp++] = (char) ch;
                        buffer[bufp++] = S_QUOTE;
                        str = dst;
                    } else {
@@ -140,13 +148,13 @@ _nc_tic_expand
            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++] = '\\';