Avoid accessing free()d memory when calling reset in one thread, after

[perl5.git] / proto.h

diff --git a/proto.h b/proto.h
index 24a18af..436fa79 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -1867,15 +1867,13 @@ PERL_CALLCONV void*     Perl_regdupe_internal(pTHX_ const regexp* r, CLONE_PARAMS* p
                        __attribute__nonnull__(pTHX_2);
 
 #endif
-PERL_CALLCONV regexp*  Perl_pregcomp(pTHX_ char* exp, char* xend, PMOP* pm)
+PERL_CALLCONV regexp*  Perl_pregcomp(pTHX_ char* exp, char* xend, U32 pm_flags)
                        __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2)
-                       __attribute__nonnull__(pTHX_3);
+                       __attribute__nonnull__(pTHX_2);
 
-PERL_CALLCONV regexp*  Perl_re_compile(pTHX_ char* exp, char* xend, PMOP* pm)
+PERL_CALLCONV regexp*  Perl_re_compile(pTHX_ char* exp, char* xend, U32 pm_flags)
                        __attribute__nonnull__(pTHX_1)
-                       __attribute__nonnull__(pTHX_2)
-                       __attribute__nonnull__(pTHX_3);
+                       __attribute__nonnull__(pTHX_2);
 
 PERL_CALLCONV char*    Perl_re_intuit_start(pTHX_ regexp* prog, SV* sv, char* strpos, char* strend, U32 flags, struct re_scream_pos_data_s *data)
                        __attribute__nonnull__(pTHX_1)
@@ -1904,6 +1902,9 @@ PERL_CALLCONV SV* Perl_reg_named_buff_get(pTHX_ const REGEXP * const rx, SV* nam
 PERL_CALLCONV SV*      Perl_reg_numbered_buff_get(pTHX_ const REGEXP * const rx, I32 paren, SV* usesv)
                        __attribute__nonnull__(pTHX_1);
 
+PERL_CALLCONV SV*      Perl_reg_qr_pkg(pTHX_ const REGEXP * const rx)
+                       __attribute__nonnull__(pTHX_1);
+
 
 PERL_CALLCONV void     Perl_regprop(pTHX_ const regexp *prog, SV* sv, const regnode* o)
                        __attribute__nonnull__(pTHX_2)
@@ -3239,6 +3240,12 @@ STATIC bool      S_is_handle_constructor(const OP *o, I32 numargs)
 STATIC I32     S_is_list_assignment(pTHX_ const OP *o)
                        __attribute__warn_unused_result__;
 
+STATIC void    S_forget_pmop(pTHX_ PMOP *const o, U32 flags)
+                       __attribute__nonnull__(pTHX_1);
+
+STATIC void    S_find_and_forget_pmops(pTHX_ OP *o)
+                       __attribute__nonnull__(pTHX_1);
+
 STATIC void    S_cop_free(pTHX_ COP *cop)
                        __attribute__nonnull__(pTHX_1);
 
@@ -3315,7 +3322,7 @@ STATIC void       S_process_special_blocks(pTHX_ const char *const fullname, GV *const
 
 #endif
 #if defined(PL_OP_SLAB_ALLOC)
-PERL_CALLCONV void*    Perl_Slab_Alloc(pTHX_ int m, size_t sz)
+PERL_CALLCONV void*    Perl_Slab_Alloc(pTHX_ size_t sz)
                        __attribute__malloc__
                        __attribute__warn_unused_result__;