← Back to branch summary

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

« back to all changes in this revision

Viewing changes to TSRM/readdir.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:
TSRM/readdir.h
7
7
 * on Windows 95/NT.
8
8
 */
9
9
 
 
10
#define _WIN32_WINNT 0x0400
 
11
 
 
12
#include <windows.h>
 
13
 
10
14
#include <io.h>
11
15
#include <stdio.h>
12
16
#include <stdlib.h>
13
17
#include <sys/types.h>
14
 
 
 
18
#include <direct.h>
15
19
 
16
20
/* struct dirent - same as Unix */
17
21
 
25
29
 
26
30
/* typedef DIR - not the same as Unix */
27
31
typedef struct {
28
 
        long handle;                            /* _findfirst/_findnext handle */
 
32
        HANDLE handle;                          /* _findfirst/_findnext handle */
29
33
        short offset;                           /* offset into directory */
30
34
        short finished;                         /* 1 if there are not more files */
31
 
        struct _finddata_t fileinfo;    /* from _findfirst/_findnext */
 
35
        WIN32_FIND_DATA fileinfo;       /* from _findfirst/_findnext */
32
36
        char *dir;                                      /* the dir we are reading */
33
37
        struct dirent dent;                     /* the dirent to return */
34
38
} DIR;
38
42
struct dirent *readdir(DIR *);
39
43
int readdir_r(DIR *, struct dirent *, struct dirent **);
40
44
int closedir(DIR *);
41
 
void rewinddir(DIR *);
42
 
 
 
45
int rewinddir(DIR *);
43
46
 
44
47
#endif /* READDIR_H */