diff options
author | Marius Bakke <[email protected]> | 2019-08-13 20:42:06 +0200 |
---|---|---|
committer | Marius Bakke <[email protected]> | 2019-08-13 20:42:06 +0200 |
commit | 462ad9f56b9665b8d22960acee73ad91f1052c9c (patch) | |
tree | 814be463d6d0517e7db9b9e6f15dbc7516955674 /gnu/packages/patches/pcre2-fix-jit_match-crash.patch | |
parent | 7f5f61ae99321a7a6e08b0100cd428e11ce6a837 (diff) | |
parent | 1b1b006afd31c5526f34d157baef492c7dde2e9c (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/pcre2-fix-jit_match-crash.patch')
-rw-r--r-- | gnu/packages/patches/pcre2-fix-jit_match-crash.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/gnu/packages/patches/pcre2-fix-jit_match-crash.patch b/gnu/packages/patches/pcre2-fix-jit_match-crash.patch new file mode 100644 index 0000000000..7543319ee9 --- /dev/null +++ b/gnu/packages/patches/pcre2-fix-jit_match-crash.patch @@ -0,0 +1,25 @@ +From: Tobias Geerinckx-Rice <[email protected]> +Date: Thu, 01 Aug 2019 21:12:52 +0200 +Subject: [PATCH] gnu: pcre2: Fix jit_match crash. + +Fixes <https://bugs.exim.org/show_bug.cgi?id=2421>, reported as a ‘secrity +problem’. + +Copied verbatim from upstream[0]. + +[0]: https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_jit_compile.c?view=patch&r1=1089&r2=1092&pathrev=1092 + +--- trunk/src/pcre2_jit_compile.c 2019/05/10 13:15:20 1089 ++++ trunk/src/pcre2_jit_compile.c 2019/05/13 16:38:18 1092 +@@ -8571,7 +8571,10 @@ + PCRE2_SPTR bptr; + uint32_t c; + +-GETCHARINC(c, cc); ++/* Patch by PH */ ++/* GETCHARINC(c, cc); */ ++ ++c = *cc++; + #if PCRE2_CODE_UNIT_WIDTH == 32 + if (c >= 0x110000) + return NULL; |