diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
commit | b5c2535eb0da4ad2b65e79df288a3674f3118717 (patch) | |
tree | 964bd1dfaa9c769878f8195db6d2bce03ef4e5c7 /src/3rdparty/pcre2/src/pcre2_match_data.c | |
parent | 3f25bcd5b7ec0d8a17a3a236099b9049b32b7755 (diff) | |
parent | 6c0ced4b7a77b089b434ab5eb9f430717f26d687 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty/pcre2/qt_attribution.json
Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15
Diffstat (limited to 'src/3rdparty/pcre2/src/pcre2_match_data.c')
-rw-r--r-- | src/3rdparty/pcre2/src/pcre2_match_data.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/3rdparty/pcre2/src/pcre2_match_data.c b/src/3rdparty/pcre2/src/pcre2_match_data.c index b297f326b5..ccc5f6740e 100644 --- a/src/3rdparty/pcre2/src/pcre2_match_data.c +++ b/src/3rdparty/pcre2/src/pcre2_match_data.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -63,6 +63,7 @@ yield = PRIV(memctl_malloc)( (pcre2_memctl *)gcontext); if (yield == NULL) return NULL; yield->oveccount = oveccount; +yield->flags = 0; return yield; } @@ -93,7 +94,12 @@ PCRE2_EXP_DEFN void PCRE2_CALL_CONVENTION pcre2_match_data_free(pcre2_match_data *match_data) { if (match_data != NULL) + { + if ((match_data->flags & PCRE2_MD_COPIED_SUBJECT) != 0) + match_data->memctl.free((void *)match_data->subject, + match_data->memctl.memory_data); match_data->memctl.free(match_data, match_data->memctl.memory_data); + } } |