cvs: php-src /ext/standard filters.c
| From: | Ilia Alshanetsky | Date: | Sun, 25 Sep 2005 13:26:20 +0000 |
| Subject: | cvs: php-src /ext/standard filters.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34134@lists.php.net to get a copy of this message | ||
iliaa Sun Sep 25 09:26:20 2005 EDT
Modified files:
/php-src/ext/standard filters.c
Log:
Fixed bug #34321 (Possible crash in filter code).
http://cvs.php.net/diff.php/php-src/ext/standard/filters.c?r1=1.46&r2=1.47&ty=u
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.46 php-src/ext/standard/filters.c:1.47
--- php-src/ext/standard/filters.c:1.46 Fri Aug 12 19:59:59 2005
+++ php-src/ext/standard/filters.c Sun Sep 25 09:26:19 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filters.c,v 1.46 2005/08/12 23:59:59 wez Exp $ */
+/* $Id: filters.c,v 1.47 2005/09/25 13:26:19 iliaa Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -943,7 +943,7 @@
CONSUME_CHAR(ps, icnt, lb_ptr, lb_cnt);
}
} else if ((!(opts & PHP_CONV_QPRINT_OPT_FORCE_ENCODE_FIRST) || line_ccnt <
inst->line_len) && ((c >= 33 && c <= 60) || (c >= 62 && c <=
126))) {
- if (line_ccnt < 2) {
+ if (line_ccnt < 2 && inst->lbchars != NULL) {
if (ocnt < inst->lbchars_len + 1) {
err = PHP_CONV_ERR_TOO_BIG;
break;