tony2001 Mon Jun 26 23:22:58 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/zlib zlib.c Log: MFH: zero-terminate strings produced with FORCE_DEFLATE http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.2&r2=1.183.2.6.2.3&diff_format=u Index: php-src/ext/zlib/zlib.c diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.2 php-src/ext/zlib/zlib.c:1.183.2.6.2.3 --- php-src/ext/zlib/zlib.c:1.183.2.6.2.2 Mon Jun 26 22:53:10 2006 +++ php-src/ext/zlib/zlib.c Mon Jun 26 23:22:58 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.183.2.6.2.2 2006/06/26 22:53:10 tony2001 Exp $ */ +/* $Id: zlib.c,v 1.183.2.6.2.3 2006/06/26 23:22:58 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -820,6 +820,8 @@ trailer[6] = (char) (stream.total_in >> 16) & 0xFF; trailer[7] = (char) (stream.total_in >> 24) & 0xFF; trailer[8] = '\0'; + } else { + s2[stream.total_out + GZIP_HEADER_LENGTH + (coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0)] = '\0'; } RETURN_STRINGL(s2, stream.total_out + GZIP_HEADER_LENGTH + (coding == CODING_GZIP ? GZIP_FOOTER_LENGTH : 0), 0); } else {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php