cvs: php-src /ext/imap php_imap.c

iliaa Wed Dec 3 01:04:34 2008 UTC Modified files: /php-src/ext/imap php_imap.c Log: MFB: Fixed bug #46731 (Missing validation for the options parameter of the imap_fetch_overview() function). http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.263&r2=1.264&diff_format=u Index: php-src/ext/imap/php_imap.c diff -u php-src/ext/imap/php_imap.c:1.263 php-src/ext/imap/php_imap.c:1.264 --- php-src/ext/imap/php_imap.c:1.263 Mon Nov 17 11:26:21 2008 +++ php-src/ext/imap/php_imap.c Wed Dec 3 01:04:33 2008 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.263 2008/11/17 11:26:21 felipe Exp $ */ +/* $Id: php_imap.c,v 1.264 2008/12/03 01:04:33 iliaa Exp $ */ #define IMAP41 @@ -3159,11 +3159,16 @@ return; } + if (flags && !(flags & FT_UID)) { + 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); array_init(return_value); - - status = (flags & FT_UID) + + status = (flags & FT_UID) ? mail_uid_sequence(imap_le_struct->imap_stream, sequence) : mail_sequence(imap_le_struct->imap_stream, sequence);