Merge branch 'gawk-5.1-stable'

4 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 92095c38..2b330a3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-04-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Small fix from the persistent-gawk guys.
+
+	* profile.c (pprint): Use estrdup instead of strdup.
+
 2022-03-27         Arnold D. Robbins     <arnold@skeeve.com>
 
 	Allow nested indirect function calls. Thanks to
diff --git a/extension/ChangeLog b/extension/ChangeLog
index c752da78..d160c031 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,9 @@
+2022-04-01         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Small fix from the persistent-gawk guys.
+
+	* rwarray.c (read_number): Fix typo in case MPFR isn't available.
+
 2022-03-11         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* rwarray.3m: Typo fixes, update copyright and modification dates.
diff --git a/extension/rwarray.c b/extension/rwarray.c
index 54032e5e..7422be9f 100644
--- a/extension/rwarray.c
+++ b/extension/rwarray.c
@@ -820,7 +820,7 @@ read_number(FILE *fp, awk_value_t *value, uint32_t code, value_storage *vs)
 			value = make_number_mpfr(vs->mpfr_val, value);
 		}
 #else
-		fatal(ext_id(_("rwarray extension: GMP/MPFR value in file but compiled without GMP/MPFR support."));
+		fatal(ext_id, _("rwarray extension: GMP/MPFR value in file but compiled without GMP/MPFR support."));
 #endif
 	}
 
diff --git a/profile.c b/profile.c
index 62e39e93..15b33721 100644
--- a/profile.c
+++ b/profile.c
@@ -668,7 +668,7 @@ cleanup:
 		case Op_K_print_rec:
 			if (pc->opcode == Op_K_print_rec)
 				// instead of `print $0', just `print'
-				tmp = strdup("");
+				tmp = estrdup("", 0);
 			else if (pc->redir_type != 0) {
 				// Avoid turning printf("hello\n") into printf(("hello\n"))
 				NODE *n = pp_top();
@@ -678,7 +678,7 @@ cleanup:
 				    && n->pp_str[n->pp_len - 1] == ')') {
 					n = pp_pop();
 
-					tmp = strdup(n->pp_str);
+					tmp = estrdup(n->pp_str, strlen(n->pp_str));
 					pp_free(n);
 				} else
 					tmp = pp_list(pc->expr_count, "()", ", ");