summaryrefslogtreecommitdiff
path: root/perl.c
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2020-03-20 09:06:57 +0000
committerDavid Mitchell <davem@iabyn.com>2020-03-20 09:06:57 +0000
commit1943af6140f72047c5028b50f947b52f8998bebd (patch)
treea02ab1e3de087e1e3bc503d0da81238ad9e9c197 /perl.c
parentb33ac5557cb0255702946345f30e9a5ef0e8d88f (diff)
downloadperl-1943af6140f72047c5028b50f947b52f8998bebd.tar.gz
fixup to free_and_set_cop_warnings()
v5.31.9-156-g94c8b9c1f0 introduced the free_and_set_cop_warnings() macro. It's first argument expects a COP rather than a COP*. Its usage in S_restore_cop_warnings(() is to modify PL_cucop, but in order to pass a COP rather than a COP*, the original commit made a local copy of PL_curcop and ended up inadvertently updating the copy instead. This commit changes the maco so it expects a COP*, and updates the bulk of its callers to use &PL_compiling rather than PL_compiling, and fixes up S_restore_cop_warnings(). The symptoms were ASAN failures in a few test scripts including uni/parser.t and ext/XS-APItest/t/handy0*.t. (The S_restore_cop_warnings() function was only used by Perl__force_out_malformed_utf8_message(), so didn't cause many issues outside of test scripts which forced such "malformed "errors).
Diffstat (limited to 'perl.c')
-rw-r--r--perl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl.c b/perl.c
index fdfd1cd8d8..9d1faf44da 100644
--- a/perl.c
+++ b/perl.c
@@ -1245,7 +1245,7 @@ perl_destruct(pTHXx)
}
}
- free_and_set_cop_warnings(PL_compiling, NULL);
+ free_and_set_cop_warnings(&PL_compiling, NULL);
cophh_free(CopHINTHASH_get(&PL_compiling));
CopHINTHASH_set(&PL_compiling, cophh_new_empty());
CopFILE_free(&PL_compiling);
@@ -3738,12 +3738,12 @@ Perl_moreswitches(pTHX_ const char *s)
return s;
case 'W':
PL_dowarn = G_WARN_ALL_ON|G_WARN_ON;
- free_and_set_cop_warnings(PL_compiling, pWARN_ALL);
+ free_and_set_cop_warnings(&PL_compiling, pWARN_ALL);
s++;
return s;
case 'X':
PL_dowarn = G_WARN_ALL_OFF;
- free_and_set_cop_warnings(PL_compiling, pWARN_NONE);
+ free_and_set_cop_warnings(&PL_compiling, pWARN_NONE);
s++;
return s;
case '*':