[BACK]Return to bz2.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / bz2

Diff for /embedaddon/php/ext/bz2/bz2.c between versions 1.1.1.2 and 1.1.1.4

version 1.1.1.2, 2012/05/29 12:34:36 version 1.1.1.4, 2014/06/15 20:03:41
Line 2 Line 2
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
   | PHP Version 5                                                        |    | PHP Version 5                                                        |
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
  | Copyright (c) 1997-2012 The PHP Group                                |  | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+    +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |    | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |    | that is bundled with this package in the file LICENSE, and is        |
Line 229  PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream Line 229  PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream
 #endif    #endif  
   
         if (php_check_open_basedir(path_copy TSRMLS_CC)) {          if (php_check_open_basedir(path_copy TSRMLS_CC)) {
   #ifdef VIRTUAL_DIR
                   free(path_copy);
   #endif
                 return NULL;                  return NULL;
         }          }
                   
Line 238  PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream Line 241  PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream
         if (opened_path && bz_file) {          if (opened_path && bz_file) {
                 *opened_path = estrdup(path_copy);                  *opened_path = estrdup(path_copy);
         }          }
   #ifdef VIRTUAL_DIR
           free(path_copy);
   #endif
         path_copy = NULL;          path_copy = NULL;
                   
         if (bz_file == NULL) {          if (bz_file == NULL) {
Line 518  static PHP_FUNCTION(bzcompress) Line 524  static PHP_FUNCTION(bzcompress)
                 efree(dest);                  efree(dest);
                 RETURN_LONG(error);                  RETURN_LONG(error);
         } else {          } else {
                /* Copy the buffer, we have perhaps allocate alot more than we need,                /* Copy the buffer, we have perhaps allocate a lot more than we need,
                    so we erealloc() the buffer to the proper size */                     so we erealloc() the buffer to the proper size */
                 dest = erealloc(dest, dest_len + 1);                  dest = erealloc(dest, dest_len + 1);
                 dest[dest_len] = 0;                  dest[dest_len] = 0;
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>