From c97e3e7438c684751bc8c8f496e3d9194c3f7aaf Mon Sep 17 00:00:00 2001 From: Zoe Slattery Date: Tue, 16 Dec 2008 21:08:50 +0000 Subject: [PATCH] bug #46884 fix --- ext/imap/php_imap.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 56a041b2ea..d1a9b0baa4 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -1560,6 +1560,12 @@ PHP_FUNCTION(imap_body) return; } + if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter"); + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap); if ((argc == 3) && (flags & FT_UID)) { @@ -2151,6 +2157,12 @@ PHP_FUNCTION(imap_fetchstructure) if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) { return; } + + if (flags && ((flags & ~FT_UID) != 0)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter"); + RETURN_FALSE; + } + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap); @@ -2197,6 +2209,12 @@ PHP_FUNCTION(imap_fetchbody) return; } + if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter"); + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap); if (argc < 4 || !(flags & FT_UID)) { @@ -2915,13 +2933,20 @@ PHP_FUNCTION(imap_sort) PHP_FUNCTION(imap_fetchheader) { zval *streamind; - long msgno, flags; + long msgno, flags=0L; pils *imap_le_struct; int msgindex, argc = ZEND_NUM_ARGS(); if (zend_parse_parameters(argc TSRMLS_CC, "rl|l", &streamind, &msgno, &flags) == FAILURE) { return; } + + + if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter"); + RETURN_FALSE; + } + ZEND_FETCH_RESOURCE(imap_le_struct, pils *, &streamind, -1, "imap", le_imap); @@ -3159,7 +3184,7 @@ PHP_FUNCTION(imap_fetch_overview) return; } - if (flags && ((flags & ~FT_UID) !=0)) { + if (flags && ((flags & ~FT_UID) != 0)) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid value for the options parameter"); RETURN_FALSE; } -- 2.40.0