[SCM] gawk branch, gawk-5.1-stable, updated. gawk-4.1.0-4382-gc07a390e

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-5.1-stable has been updated
       via  c07a390e647b74a40f1726e6fe3580bc370f178b (commit)
      from  319e10d7a56b9a99788a869a5ae3890ae6205cbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=c07a390e647b74a40f1726e6fe3580bc370f178b

commit c07a390e647b74a40f1726e6fe3580bc370f178b
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Tue Mar 22 21:07:52 2022 +0200

    Impove lint checks in builtin functions.

diff --git a/ChangeLog b/ChangeLog
index 96a80815..63cce95d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2022-03-22         Arnold D. Robbins     <arnold@skeeve.com>
+
+       Make lint checks for builtin functions smarter. Initial
+       report from Timothy Sample <samplet@ngyro.com>.
+
+       * builtin.c (do_fflush): Require string type.
+       (printf_common): Ditto.
+       (do_index): Allow strnum for both arguments.
+       (do_length): Ditto.
+       (do_strftime): Ditto.
+       (do_substr): Require numbers for arguments 2 and 3, string or
+       strnum for argument 1.
+       (do_match): Require string or strnum for argument 1.
+       (do_dcgettext): Require strings for all arguments.
+       (do_bindtextdomain): Ditto.
+       (do_dcngettext): Require strings for arguments 5, 4, 2, and 1, and
+       number for argument 3.
+
 2022-02-27         Arnold D. Robbins     <arnold@skeeve.com>
 
        * awk.h (cant_happen): Change to allow a format string and arguments,
diff --git a/builtin.c b/builtin.c
index 2a1869e6..f92e0cae 100644
--- a/builtin.c
+++ b/builtin.c
@@ -262,6 +262,8 @@ do_fflush(int nargs)
        }
 
        tmp = POP_STRING();
+       if (do_lint && (fixtype(tmp)->flags & STRING) == 0)
+               lintwarn(_("%s: received non-string argument"), "fflush");
        file = tmp->stptr;
        len = tmp->stlen;
 
@@ -411,9 +413,9 @@ do_index(int nargs)
        POP_TWO_SCALARS(s1, s2);
 
        if (do_lint) {
-               if ((fixtype(s1)->flags & STRING) == 0)
+               if ((fixtype(s1)->flags & (STRING|USER_INPUT)) == 0)
                        lintwarn(_("%s: received non-string first argument"), 
"index");
-               if ((fixtype(s2)->flags & STRING) == 0)
+               if ((fixtype(s2)->flags & (STRING|USER_INPUT)) == 0)
                        lintwarn(_("%s: received non-string second argument"), 
"index");
        }
 
@@ -597,7 +599,7 @@ do_length(int nargs)
 
        assert(tmp->type == Node_val);
 
-       if (do_lint && (fixtype(tmp)->flags & STRING) == 0)
+       if (do_lint && (fixtype(tmp)->flags & (STRING|USER_INPUT)) == 0)
                lintwarn(_("%s: received non-string argument"), "length");
        tmp = force_string(tmp);
 
@@ -1728,6 +1730,8 @@ printf_common(int nargs)
        }
 
        args_array[0] = force_string(args_array[0]);
+       if (do_lint && (fixtype(args_array[0])->flags & STRING) == 0)
+               lintwarn(_("%s: received non-string format string argument"), 
"printf/sprintf");
        r = format_tree(args_array[0]->stptr, args_array[0]->stlen, args_array, 
nargs);
        for (i = 0; i < nargs; i++)
                DEREF(args_array[i]);
@@ -1858,15 +1862,21 @@ do_substr(int nargs)
 
        if (nargs == 3) {
                t1 = POP_NUMBER();
+               if (do_lint && (fixtype(t1)->flags & NUMBER) == 0)
+                       lintwarn(_("%s: received non-numeric third argument"), 
"substr");
                d_length = get_number_d(t1);
                DEREF(t1);
        }
 
        t1 = POP_NUMBER();
+       if (do_lint && (fixtype(t1)->flags & NUMBER) == 0)
+               lintwarn(_("%s: received non-numeric second argument"), 
"substr");
        d_index = get_number_d(t1);
        DEREF(t1);
 
        t1 = POP_STRING();
+       if (do_lint && (fixtype(t1)->flags & (STRING|USER_INPUT)) == 0)
+               lintwarn(_("%s: received non-string first argument"), "substr");
 
        if (nargs == 3) {
                if (! (d_length >= 1)) {
@@ -2028,7 +2038,7 @@ do_strftime(int nargs)
                unref(sub);
 
                if (val != NULL) {
-                       if (do_lint && (fixtype(val)->flags & STRING) == 0)
+                       if (do_lint && (fixtype(val)->flags & 
(STRING|USER_INPUT)) == 0)
                                lintwarn(_("strftime: format value in 
PROCINFO[\"strftime\"] has numeric type"));
                        val = force_string(val);
                        format = val->stptr;
@@ -2043,6 +2053,7 @@ do_strftime(int nargs)
                if (nargs == 3) {
                        t3 = POP_SCALAR();
                        do_gmt = boolval(t3);
+                       // no lint check, we allow number or string to give us 
a boolean value
                        DEREF(t3);
                }
 
@@ -2754,6 +2765,8 @@ do_match(int nargs)
        tre = POP();
        rp = re_update(tre);
        t1 = POP_STRING();
+       if (do_lint && (fixtype(t1)->flags & (STRING|USER_INPUT)) == 0)
+               lintwarn(_("%s: received non-string first argument"), "match");
 
        rstart = research(rp, t1->stptr, 0, t1->stlen, RE_NEED_START);
        if (rstart >= 0) {      /* match succeded */
@@ -3952,6 +3965,8 @@ do_dcgettext(int nargs)
 
        if (nargs == 3) {       /* third argument */
                tmp = POP_STRING();
+               if (do_lint && (fixtype(tmp)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string third argument"), 
"dcgettext");
                lc_cat = localecategory_from_argument(tmp);
                DEREF(tmp);
        } else
@@ -3959,6 +3974,8 @@ do_dcgettext(int nargs)
 
        if (nargs >= 2) {  /* second argument */
                t2 = POP_STRING();
+               if (do_lint && (fixtype(t2)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string second argument"), 
"dcgettext");
                domain = t2->stptr;
                str_terminate(t2, save2);
        } else
@@ -3966,15 +3983,21 @@ do_dcgettext(int nargs)
 #else
        if (nargs == 3) {
                tmp = POP_STRING();
+               if (do_lint && (fixtype(tmp)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string third argument"), 
"dcgettext");
                DEREF(tmp);
        }
        if (nargs >= 2) {
                t2 = POP_STRING();
+               if (do_lint && (fixtype(t2)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string second argument"), 
"dcgettext");
                DEREF(t2);
        }
 #endif
 
        t1 = POP_STRING();      /* first argument */
+       if (do_lint && (fixtype(t1)->flags & STRING) == 0)
+               lintwarn(_("%s: received non-string first argument"), 
"dcgettext");
        string = t1->stptr;
 
 #if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
@@ -4015,6 +4038,8 @@ do_dcngettext(int nargs)
 
        if (nargs == 5) {       /* fifth argument */
                tmp = POP_STRING();
+               if (do_lint && (fixtype(tmp)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string fifth argument"), 
"dcngettext");
                lc_cat = localecategory_from_argument(tmp);
                DEREF(tmp);
        } else
@@ -4023,6 +4048,8 @@ do_dcngettext(int nargs)
        t3 = NULL;
        if (nargs >= 4) {       /* fourth argument */
                t3 = POP_STRING();
+               if (do_lint && (fixtype(t3)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string fourth argument"), 
"dcngettext");
                domain = t3->stptr;
                save = domain[t3->stlen];
                domain[t3->stlen] = '\0';
@@ -4032,22 +4059,32 @@ do_dcngettext(int nargs)
 #else
        if (nargs == 5) {
                tmp = POP_STRING();
+               if (do_lint && (fixtype(tmp)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string fifth argument"), 
"dcngettext");
                DEREF(tmp);
        }
        if (nargs >= 4) {
                t3 = POP_STRING();
+               if (do_lint && (fixtype(t3)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string fourth argument"), 
"dcngettext");
                DEREF(t3);
        }
 #endif
 
        t2 = POP_NUMBER();      /* third argument */
+       if (do_lint && (fixtype(t2)->flags & NUMBER) == 0)
+               lintwarn(_("%s: received non-numeric third argument"), 
"dcngettext");
        d = get_number_d(t2);
        DEREF(t2);
 
        number = (unsigned long) double_to_int(d);
        t2 = POP_STRING();      /* second argument */
+       if (do_lint && (fixtype(t2)->flags & STRING) == 0)
+               lintwarn(_("%s: received non-string second argument"), 
"dcngettext");
        string2 = t2->stptr;
        t1 = POP_STRING();      /* first argument */
+       if (do_lint && (fixtype(t1)->flags & STRING) == 0)
+               lintwarn(_("%s: received non-string first argument"), 
"dcngettext");
        string1 = t1->stptr;
 
 #if ENABLE_NLS && defined(LC_MESSAGES) && HAVE_DCGETTEXT
@@ -4104,6 +4141,8 @@ do_bindtextdomain(int nargs)
 
        if (nargs == 2) {       /* second argument */
                t2 = POP_STRING();
+               if (do_lint && (fixtype(t2)->flags & STRING) == 0)
+                       lintwarn(_("%s: received non-string second argument"), 
"bindtextdomain");
                domain = (const char *) t2->stptr;
                save = t2->stptr[t2->stlen];
                t2->stptr[t2->stlen] = '\0';
@@ -4111,6 +4150,8 @@ do_bindtextdomain(int nargs)
 
        /* first argument */
        t1 = POP_STRING();
+       if (do_lint && (fixtype(t1)->flags & STRING) == 0)
+               lintwarn(_("%s: received non-string first argument"), 
"bindtextdomain");
        if (t1->stlen > 0) {
                directory = (const char *) t1->stptr;
                str_terminate(t1, save1);

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog | 18 ++++++++++++++++++
 builtin.c | 49 +++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 63 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
gawk