Attachment 470460 Details for Bug 740484

[patch] chngeset containing the fix for REmatch()

mawk.patch (text/plain), 3.83 KB, created by Forgotten User cAXlJ_FoSf on 2012-01-10 10:44:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User cAXlJ_FoSf

Created: 2012-01-10 10:44:46 UTC

Size: 3.83 KB

patch

obsolete

># patch by Thomas E. Dickey <dickey@invisible-island.net>
># created  Mon Jan  9 01:23:08 UTC 2012
># ------------------------------------------------------------------------------
># CHANGES    |   12 ++++++++++--
># files.c    |    4 ++--
># fin.c      |    4 ++--
># patchlev.h |    4 ++--
># rexp3.c    |   10 ++++++++--
># 5 files changed, 24 insertions(+), 10 deletions(-)
># ------------------------------------------------------------------------------
>Index: CHANGES
>--- mawk-1.3.4-20100224+bad/CHANGES	2010-02-17 11:48:46.000000000 +0000
>+++ mawk-1.3.4-20100224+good/CHANGES	2010-02-21 00:19:40.000000000 +0000
>@@ -1,8 +1,16 @@
>--- $MawkId: CHANGES,v 1.100 2010/02/17 11:48:46 tom Exp $
>+-- $MawkId: CHANGES,v 1.102 2010/02/21 00:19:40 tom Exp $
> 
> Changes by Thomas E Dickey <dickey@invisible-island.net>
> 
>-20100217
>+20100220
>+	+ modify mawktest script to report results from all tests, rather than
>+	  halting on the first failure.
>+
>+	+ add limit-check after processing match(test, "[^0-9A-Za-z]") to
>+	  ensure the internal trailing null of the test-string is not mistaken
>+	  for part of the string, i.e., RSTART, RLENGTH are computed correctly
>+	  (report by Markus Gnam).
>+
> 	+ modify parsing of -W option to use comma-separated values, e.g.,
> 	  "-Wi,e" for "-Winteractive" and "-Werror".
> 
>Index: files.c
>--- mawk-1.3.4-20100224+bad/files.c	2009-12-17 00:06:51.000000000 +0000
>+++ mawk-1.3.4-20100224+good/files.c	2010-02-21 01:32:50.000000000 +0000
>@@ -10,7 +10,7 @@
> ********************************************/
> 
> /*
>- * $MawkId: files.c,v 1.12 2009/12/17 00:06:51 tom Exp $
>+ * $MawkId: files.c,v 1.13 2010/02/21 01:32:50 tom Exp $
>  * @Log: files.c,v @
>  * Revision 1.9  1996/01/14  17:14:10  mike
>  * flush_all_output()
>@@ -506,7 +506,7 @@
> int
> wait_for(int pid)
> {
>-    int exit_status;
>+    int exit_status = 0;
>     struct child *p;
>     int id;
> 
>Index: fin.c
>--- mawk-1.3.4-20100224+bad/fin.c	2010-01-29 20:03:43.000000000 +0000
>+++ mawk-1.3.4-20100224+good/fin.c	2010-02-21 01:45:21.000000000 +0000
>@@ -10,7 +10,7 @@
> ********************************************/
> 
> /*
>- * $MawkId: fin.c,v 1.23 2010/01/29 20:03:43 Jan.Psota Exp $
>+ * $MawkId: fin.c,v 1.24 2010/02/21 01:45:21 tom Exp $
>  * @Log: fin.c,v @
>  * Revision 1.10  1995/12/24  22:23:22  mike
>  * remove errmsg() from inside FINopen
>@@ -317,7 +317,7 @@
> 	unsigned rr;
> 	unsigned amount = (unsigned) (fin->limit - p);
> 
>-	p = (char *) memcpy(fin->buff, p, r = (unsigned) (fin->limit - p));
>+	p = (char *) memmove(fin->buff, p, r = (unsigned) (fin->limit - p));
> 	q = p + r;
> 	rr = fin->nbuffs * BUFFSZ - r;
> 
>Index: patchlev.h
>--- mawk-1.3.4-20100224+bad/patchlev.h	2010-02-17 11:41:46.000000000 +0000
>+++ mawk-1.3.4-20100224+good/patchlev.h	2010-02-21 00:18:47.000000000 +0000
>@@ -1,6 +1,6 @@
> /*
>- * $MawkId: patchlev.h,v 1.17 2010/02/17 11:41:46 tom Exp $
>+ * $MawkId: patchlev.h,v 1.18 2010/02/21 00:18:47 tom Exp $
>  */
> #define  PATCHLEVEL	3
> #define  PATCH_STRING	".4"
>-#define  DATE_STRING    "20100217"
>+#define  DATE_STRING    "20100220"
>Index: rexp3.c
>--- mawk-1.3.4-20100224+bad/rexp3.c	2010-02-17 11:38:24.000000000 +0000
>+++ mawk-1.3.4-20100224+good/rexp3.c	2010-02-21 02:05:44.000000000 +0000
>@@ -10,7 +10,7 @@
> ********************************************/
> 
> /*
>- * $MawkId: rexp3.c,v 1.19 2010/02/17 11:38:24 Jonathan.Nieder Exp $
>+ * $MawkId: rexp3.c,v 1.22 2010/02/21 02:05:44 tom Exp $
>  * @Log: rexp3.c,v @
>  * Revision 1.3  1993/07/24  17:55:15  mike
>  * more cleanup
>@@ -157,7 +157,10 @@
> 	goto reswitch;
> 
>     case M_STR + U_ON + END_OFF:
>-	if (!(s = str_str(s, str_len, m->s_data.str, m->s_len))) {
>+	if (s >= str_end) {
>+	    goto refill;
>+	}
>+	if (!(s = str_str(s, (unsigned) (str_end - s), m->s_data.str, m->s_len))) {
> 	    goto refill;
> 	}
> 	if (s >= str + strlen(str)) {
>@@ -237,6 +240,9 @@
> 		s++;
> 	    }
> 	}
>+	if (s >= str_end) {
>+	    goto refill;
>+	}
> 	s++;
> 	push(m, s, sp, ss, U_ON);
> 	if (!ss) {

Actions: View | Diff

Attachments on bug 740484: 470460