ncurses 6.0 - patch 20170729
[ncurses.git] / ncurses / tinfo / lib_tparm.c
index 4f18859f7e43d247bb205867f1d2566954cf1edc..4431f3843d0c327fd99f7959c447ff9372c0a691 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2017 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            *
@@ -42,7 +42,7 @@
 #include <ctype.h>
 #include <tic.h>
 
-MODULE_ID("$Id: lib_tparm.c,v 1.94 2015/07/17 01:03:35 tom Exp $")
+MODULE_ID("$Id: lib_tparm.c,v 1.103 2017/07/30 00:13:55 tom Exp $")
 
 /*
  *     char *
@@ -326,6 +326,7 @@ parse_format(const char *s, char *format, int *len)
 
 #define isUPPER(c) ((c) >= 'A' && (c) <= 'Z')
 #define isLOWER(c) ((c) >= 'a' && (c) <= 'z')
+#define tc_BUMP()  if (level < 0 && number < 2) number++
 
 /*
  * Analyze the string to see how many parameters we need from the varargs list,
@@ -346,6 +347,7 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
     int lastpop = -1;
     int len;
     int number = 0;
+    int level = -1;
     const char *cp = string;
     static char dummy[] = "";
 
@@ -378,22 +380,27 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
 #ifdef EXP_XTERM_1005
            case 'u':
 #endif
-               if (lastpop <= 0)
-                   number++;
+               if (lastpop <= 0) {
+                   tc_BUMP();
+               }
+               level -= 1;
                lastpop = -1;
                break;
 
            case 'l':
            case 's':
-               if (lastpop > 0)
+               if (lastpop > 0) {
+                   level -= 1;
                    p_is_s[lastpop - 1] = dummy;
-               ++number;
+               }
+               tc_BUMP();
                break;
 
            case 'p':
                cp++;
                i = (UChar(*cp) - '0');
                if (i >= 0 && i <= NUM_PARM) {
+                   ++level;
                    lastpop = i;
                    if (lastpop > *popcount)
                        *popcount = lastpop;
@@ -401,20 +408,22 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
                break;
 
            case 'P':
-               ++number;
                ++cp;
                break;
 
            case 'g':
+               ++level;
                cp++;
                break;
 
            case S_QUOTE:
+               ++level;
                cp += 2;
                lastpop = -1;
                break;
 
            case L_BRACE:
+               ++level;
                cp++;
                while (isdigit(UChar(*cp))) {
                    cp++;
@@ -434,14 +443,15 @@ _nc_tparm_analyze(const char *string, char *p_is_s[NUM_PARM], int *popcount)
            case '=':
            case '<':
            case '>':
+               tc_BUMP();
+               level -= 1;     /* pop 2, operate, push 1 */
                lastpop = -1;
-               number += 2;
                break;
 
            case '!':
            case '~':
+               tc_BUMP();
                lastpop = -1;
-               ++number;
                break;
 
            case 'i':
@@ -527,7 +537,6 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
     termcap_hack = FALSE;
     if (popcount == 0) {
        termcap_hack = TRUE;
-       popcount = number;
        for (i = number - 1; i >= 0; i--) {
            if (p_is_s[i])
                spush(p_is_s[i]);
@@ -538,10 +547,15 @@ tparam_internal(int use_TPARM_ARG, const char *string, va_list ap)
 #ifdef TRACE
     if (USE_TRACEF(TRACE_CALLS)) {
        for (i = 0; i < num_args; i++) {
-           if (p_is_s[i] != 0)
+           if (p_is_s[i] != 0) {
                save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
-           else
+           } else if ((long) param[i] > 32767 || (long) param[i] < 0) {
+               _tracef("BUG: problem with tparm parameter #%d of %d",
+                       i + 1, num_args);
+               break;
+           } else {
                save_number(", %d", (int) param[i], 0);
+           }
        }
        _tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
        TPS(out_used) = 0;