← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/php5/gutsy

« back to all changes in this revision

Viewing changes to ext/zip/php_zip.h

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt, CVE-2007-0905, CVE-2007-0906, CVE-2007-0909, CVE-2007-0910
  • Date: 2007-02-20 17:54:46 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070220175446-nudqyuv0dfowel3r
Tags: 5.2.1-0ubuntu1
* New upstream security/bugfix release:
  - safe_mode & open_basedir bypasses inside the session extension
    [CVE-2007-0905]
  - multiple buffer overflows in various extensions and functions
    [CVE-2007-0906]
  - underflow in the internal sapi_header_op() function [CVE-2007-0907]
  - information disclosure in the wddx extension [CVE-2007-0908]
  - string format vulnerability in *print() functions on 64 bit systems
    [CVE-2007-0909]
  - possible clobbering of super-globals in several code paths
    [CVE-2007-0910]
* Adapted patches to new upstream release:
  - 006-debian_quirks.patch
  - 034-apache2_umask_fix.patch
  - 044-strtod_arm_fix.patch
* Drop 109-libdb4.4.patch: Obsolete, upstream now checks for db 4.5 and 4.4.
* Drop 114-zend_alloc.c_m68k_alignment.patch and
  115-zend_alloc.c_memleak.patch: Applied upstream.
* Add debian/patches/000upstream-str_ireplace_offbyone.patch:
  - Fix off-by-one in str_ireplace(), a regression introduced in 5.2.1.
  - Patch taken from upstream CVS:
    http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.630&r2=1.631
  - CVE-2007-0911
* debian/control: Set Ubuntu maintainer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/zip/php_zip.h
2
2
  +----------------------------------------------------------------------+
3
3
  | PHP Version 5                                                        |
4
4
  +----------------------------------------------------------------------+
5
 
  | Copyright (c) 1997-2006 The PHP Group                                |
 
5
  | Copyright (c) 1997-2007 The PHP Group                                |
6
6
  +----------------------------------------------------------------------+
7
7
  | This source file is subject to version 3.01 of the PHP license,      |
8
8
  | that is bundled with this package in the file LICENSE, and is        |
16
16
  +----------------------------------------------------------------------+
17
17
*/
18
18
 
19
 
/* $Id: php_zip.h,v 1.10 2006/07/24 16:58:58 pajoye Exp $ */
 
19
/* $Id: php_zip.h,v 1.10.2.2 2007/01/01 09:36:10 sebastian Exp $ */
20
20
 
21
21
#ifndef PHP_ZIP_H
22
22
#define PHP_ZIP_H
24
24
extern zend_module_entry zip_module_entry;
25
25
#define phpext_zip_ptr &zip_module_entry
26
26
 
27
 
#ifdef PHP_WIN32
28
 
#define PHP_ZIP_API __declspec(dllexport)
29
 
#else
30
 
#define PHP_ZIP_API
31
 
#endif
32
 
 
33
27
#ifdef ZTS
34
28
#include "TSRM.h"
35
29
#endif
36
30
 
37
31
#include "lib/zip.h"
38
32
 
39
 
#ifndef ZEND_ENGINE_2_1
40
 
# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0)
41
 
#  define ZEND_ENGINE_2_1
42
 
# endif
43
 
#endif
44
 
 
45
33
typedef struct _ze_zip_rsrc {
46
34
        struct zip *za;
47
35
        int index_current;
55
43
        struct zip_stat sb;
56
44
} zip_read_rsrc;
57
45
 
58
 
#ifdef ZEND_ENGINE_2_1
59
46
#define ZIPARCHIVE_ME(name, arg_info, flags)    ZEND_FENTRY(name, c_ziparchive_ ##name, arg_info, flags)
60
47
#define ZIPARCHIVE_METHOD(name) ZEND_NAMED_FUNCTION(c_ziparchive_##name)
61
48
 
70
57
        int filename_len;
71
58
} ze_zip_object;
72
59
 
73
 
zend_class_entry *zip_class_entry_ce;
74
 
 
75
60
php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);
76
61
php_stream *php_stream_zip_open(char *filename, char *path, char *mode STREAMS_DC TSRMLS_DC);
77
62
 
78
63
extern php_stream_wrapper php_stream_zip_wrapper;
79
 
#endif
80
 
 
81
 
PHP_FUNCTION(zip_open);
82
 
PHP_FUNCTION(zip_read);
83
 
PHP_FUNCTION(zip_close);
84
 
PHP_FUNCTION(zip_entry_read);
85
 
PHP_FUNCTION(zip_entry_filesize);
86
 
PHP_FUNCTION(zip_entry_name);
87
 
PHP_FUNCTION(zip_entry_compressedsize);
88
 
PHP_FUNCTION(zip_entry_compressionmethod);
89
 
PHP_FUNCTION(zip_entry_open);
90
 
PHP_FUNCTION(zip_entry_close);
91
64
 
92
65
#endif  /* PHP_ZIP_H */
93
66