Hello Ilia, Hello Greg,

  this fixes the pecl/Phar issue with bzip2 for me as well!

marcus

Sunday, December 16, 2007, 6:22:01 PM, you wrote:

> iliaa           Sun Dec 16 17:22:01 2007 UTC

>   Modified files:              (Branch: PHP_5_3)
>     /php-src/ext/bz2    bz2_filter.c 
>   Log:
>   
>   MFB: Fixed bug #43589 (a possible infinite loop in bz2_filter.c)
>   
> http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.3.2.2.2.5&r2=1.3.2.2.2.5.2.1&diff_format=u
> Index: php-src/ext/bz2/bz2_filter.c
> diff -u php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5
> php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.1
> --- php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5    Thu Aug  9 23:27:22 2007
> +++ php-src/ext/bz2/bz2_filter.c        Sun Dec 16 17:22:00 2007
> @@ -16,7 +16,7 @@
>     +----------------------------------------------------------------------+
>  */
>  
> -/* $Id: bz2_filter.c,v 1.3.2.2.2.5 2007/08/09 23:27:22 iliaa Exp $ */
> +/* $Id: bz2_filter.c,v 1.3.2.2.2.5.2.1 2007/12/16 17:22:00 iliaa Exp $ */
>  
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -132,6 +132,8 @@
>                                 data->strm.avail_out = data->outbuf_len;
>                                 data->strm.next_out = data->outbuf;
>                                 exit_status = PSFS_PASS_ON;
> +                       } else if (status == BZ_OK) {
> +                               break;
>                         }
>                 }
>         }




Best regards,
 Marcus

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to