diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
| commit | 4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf (patch) | |
| tree | 3725689ea9e318ee1fc5ef34a6a83f62bc943802 /ext/pcre/pcre2lib/pcre2_serialize.c | |
| parent | 76d0e3d514ba47ad29c06e97efc16fef41e8186b (diff) | |
| parent | 0e3dede07c6677ed5cc60ddad3f7552f83b45a4b (diff) | |
| download | php-git-4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Happy new year (Update copyright to 2018)
Happy new year (Update copyright to 2018)
Revert "Enable ODBC tests on AppVeyor"
Enable ODBC tests on AppVeyor
Skip on Travis-CI
Extend skip section
2018
missing changelog entries + fix version and date
missing changelog entries
2018
Trailing whitespaces
Diffstat (limited to 'ext/pcre/pcre2lib/pcre2_serialize.c')
| -rw-r--r-- | ext/pcre/pcre2lib/pcre2_serialize.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcre/pcre2lib/pcre2_serialize.c b/ext/pcre/pcre2lib/pcre2_serialize.c index d2cc603cbb..da1534d904 100644 --- a/ext/pcre/pcre2lib/pcre2_serialize.c +++ b/ext/pcre/pcre2lib/pcre2_serialize.c @@ -214,10 +214,10 @@ for (i = 0; i < number_of_codes; i++) if (dst_re->magic_number != MAGIC_NUMBER || dst_re->name_entry_size > MAX_NAME_SIZE + IMM2_SIZE + 1 || dst_re->name_count > MAX_NAME_COUNT) - { - memctl->free(dst_re, memctl->memory_data); + { + memctl->free(dst_re, memctl->memory_data); return PCRE2_ERROR_BADSERIALIZEDDATA; - } + } /* At the moment only one table is supported. */ |