diff options
| author | Michael Santos <[email protected]> | 2010-03-18 20:08:10 -0400 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-04-14 08:12:01 +0200 |
| commit | dfc73e7475ba36998956da9b2f8ce58f8f2482d8 (patch) | |
| tree | 4cc4eeb0eb22f0653632678bc786e716d38600ad /erts | |
| parent | e313bb4982f50ab15687d5063be7bfa2a6c4f76c (diff) | |
| download | otp-dfc73e7475ba36998956da9b2f8ce58f8f2482d8.tar.gz otp-dfc73e7475ba36998956da9b2f8ce58f8f2482d8.tar.bz2 otp-dfc73e7475ba36998956da9b2f8ce58f8f2482d8.zip | |
Fix check for compile workspace overflow
Patch from:
http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch
Test case:
N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]).
Compiling large regular expressions could overflow the workspace
buffer. Modify the test to check for a value smaller than the buffer
size.
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/pcre/pcre_compile.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c index 29743362d4..9508c5a697 100644 --- a/erts/emulator/pcre/pcre_compile.c +++ b/erts/emulator/pcre/pcre_compile.c @@ -92,6 +92,11 @@ is 4 there is plenty of room. */ #define COMPILE_WORK_SIZE (4096) +/* The overrun tests check for a slightly smaller size so that they detect the +overrun before it actually does run off the end of the data block. */ + +#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) + /* Table for handling escaped characters in the range '0'-'z'. Positive returns are simple data values; negative values are for special things like \d and so @@ -2445,7 +2450,7 @@ for (;; ptr++) #ifdef DEBUG if (code > cd->hwm) cd->hwm = code; /* High water info */ #endif - if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ + if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ { *errorcodeptr = ERR52; goto FAILED; @@ -2494,7 +2499,7 @@ for (;; ptr++) /* In the real compile phase, just check the workspace used by the forward reference list. */ - else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) + else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) { *errorcodeptr = ERR52; goto FAILED; |