From 1ac0c5589767dc15e16ab06d906660ce503f6934 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Mon, 27 Sep 2010 07:08:04 +0000 Subject: [PATCH] Fix bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with large amount of data). --- ext/filter/logical_filters.c | 5 +++++ ext/filter/tests/bug52929.phpt | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 ext/filter/tests/bug52929.phpt diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index bfa919262d..a1e6aee8fa 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -531,6 +531,11 @@ void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ int matches; + /* The maximum length of an e-mail address is 320 octets, per RFC 2821. */ + if (Z_STRLEN_P(value) > 320) { + RETURN_VALIDATION_FAILED + } + re = pcre_get_compiled_regex((char *)regexp, &pcre_extra, &preg_options TSRMLS_CC); if (!re) { RETURN_VALIDATION_FAILED diff --git a/ext/filter/tests/bug52929.phpt b/ext/filter/tests/bug52929.phpt new file mode 100644 index 0000000000..29332959f7 --- /dev/null +++ b/ext/filter/tests/bug52929.phpt @@ -0,0 +1,18 @@ +--TEST-- +Bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with large amount of data) +--SKIPIF-- + +--FILE-- +