summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Vernon <matthew@debian.org>2017-11-30 15:37:30 +0000
committerMatthew Vernon <matthew@debian.org>2017-11-30 15:37:30 +0000
commita1c9961364820d491470bba8fb48bf51b0c56895 (patch)
treefab812f207ae7146e1ed86c30efbb24d94f0f4fc
parent04ef36a79523e6acebbf3b1ee6e7194f3217e6ea (diff)
Patch from MariaDB to fix stack frame size detection
This comes via Ondřej Surý <ondrej@debian.org> in #878107. Upstream don't consider it sufficiently important to fix, but it is causing us issues.
-rw-r--r--pcre_exec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/pcre_exec.c b/pcre_exec.c
index 24b23ca..55230cd 100644
--- a/pcre_exec.c
+++ b/pcre_exec.c
@@ -509,6 +509,12 @@ Returns: MATCH_MATCH if matched ) these values are >= 0
(e.g. stopped by repeated call or recursion limit)
*/
+#ifdef __GNUC__
+static int
+match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
+ PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
+ unsigned int rdepth) __attribute__((noinline,noclone));
+#endif
static int
match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,