cvs: php-src(PHP_4_4) /ext/standard mail.c

iliaa Fri Mar 30 00:29:32 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/standard mail.c Log: MFB: Fixed MOPB-34-2007:PHP mail() Header Injection Through Subject and To Parameters http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.66.2.12.4.5&r2=1.66.2.12.4.6&diff_format=u Index: php-src/ext/standard/mail.c diff -u php-src/ext/standard/mail.c:1.66.2.12.4.5 php-src/ext/standard/mail.c:1.66.2.12.4.6 --- php-src/ext/standard/mail.c:1.66.2.12.4.5 Tue Mar 27 09:20:57 2007 +++ php-src/ext/standard/mail.c Fri Mar 30 00:29:32 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.66.2.12.4.5 2007/03/27 09:20:57 tony2001 Exp $ */ +/* $Id: mail.c,v 1.66.2.12.4.6 2007/03/30 00:29:32 iliaa Exp $ */ #include <stdlib.h> #include <ctype.h> @@ -48,8 +48,8 @@ #define SKIP_LONG_HEADER_SEP(str, pos) \ if (str[pos] == '\r' && str[pos + 1] == '\n' && (str[pos + 2] == ' ' || str[pos + 2] == '\t')) { \ - pos += 3; \ - while (str[pos] == ' ' || str[pos] == '\t') { \ + pos += 2; \ + while (str[pos + 1] == ' ' || str[pos + 1] == '\t') { \ pos++; \ } \ continue; \