chiark / gitweb /
Patch from MariaDB to fix stack frame size detection
authorMatthew Vernon <matthew@debian.org>
Thu, 30 Nov 2017 15:37:30 +0000 (15:37 +0000)
committerMatthew Vernon <matthew@debian.org>
Thu, 30 Nov 2017 15:37:30 +0000 (15:37 +0000)
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.

pcre_exec.c

index 24b23ca28649ba4ba97fe06dbd1d9d49d9d8b9ad..55230cdb0577e3d26577931dfb984a4bb770cc5c 100644 (file)
@@ -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,