diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-30 11:53:36 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-30 11:53:36 +0300 |
| commit | dba454ef54bfc83cc1ade93c668f39ec0a5895d3 (patch) | |
| tree | 1ea904c2a08d6258cd28e22138ea789d9eb8d037 /pcre/pcretest.c | |
| parent | dfd7749120e592299fddf2710bc336ee1000ae07 (diff) | |
| download | mariadb-git-dba454ef54bfc83cc1ade93c668f39ec0a5895d3.tar.gz | |
8.41
Diffstat (limited to 'pcre/pcretest.c')
| -rw-r--r-- | pcre/pcretest.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pcre/pcretest.c b/pcre/pcretest.c index 5b73a918075..f1303037281 100644 --- a/pcre/pcretest.c +++ b/pcre/pcretest.c @@ -177,7 +177,7 @@ that differ in their output from isprint() even in the "C" locale. */ #define PRINTABLE(c) ((c) >= 32 && (c) < 127) #endif -#define PRINTOK(c) (locale_set? isprint(c) : PRINTABLE(c)) +#define PRINTOK(c) (locale_set? (((c) < 256) && isprint(c)) : PRINTABLE(c)) /* Posix support is disabled in 16 or 32 bit only mode. */ #if !defined SUPPORT_PCRE8 && !defined NOPOSIX @@ -426,11 +426,11 @@ argument, the casting might be incorrectly applied. */ #define PCRE_COPY_NAMED_SUBSTRING32(rc, re, bptr, offsets, count, \ namesptr, cbuffer, size) \ rc = pcre32_copy_named_substring((pcre32 *)re, (PCRE_SPTR32)bptr, offsets, \ - count, (PCRE_SPTR32)namesptr, (PCRE_UCHAR32 *)cbuffer, size/2) + count, (PCRE_SPTR32)namesptr, (PCRE_UCHAR32 *)cbuffer, size/4) #define PCRE_COPY_SUBSTRING32(rc, bptr, offsets, count, i, cbuffer, size) \ rc = pcre32_copy_substring((PCRE_SPTR32)bptr, offsets, count, i, \ - (PCRE_UCHAR32 *)cbuffer, size/2) + (PCRE_UCHAR32 *)cbuffer, size/4) #define PCRE_DFA_EXEC32(count, re, extra, bptr, len, start_offset, options, \ offsets, size_offsets, workspace, size_workspace) \ @@ -4834,7 +4834,16 @@ while (!done) continue; case 'O': - while(isdigit(*p)) n = n * 10 + *p++ - '0'; + while(isdigit(*p)) + { + if (n > (INT_MAX-10)/10) /* Hack to stop fuzzers */ + { + printf("** \\O argument is too big\n"); + yield = 1; + goto EXIT; + } + n = n * 10 + *p++ - '0'; + } if (n > size_offsets_max) { size_offsets_max = n; |