diff options
| author | Antony Dovgal <tony2001@php.net> | 2008-08-29 10:53:13 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2008-08-29 10:53:13 +0000 |
| commit | c7c4d96c73777e83746cca5f9a363a95e7a84b4c (patch) | |
| tree | 353f8f6e4c3ff5f0cbc9d84a0ddc68cc3d45616d /ext/fileinfo/libmagic | |
| parent | ef8ae4dfc5bf654ef3f159ca52767d7ba142512b (diff) | |
| download | php-git-c7c4d96c73777e83746cca5f9a363a95e7a84b4c.tar.gz | |
fix invalid read
Diffstat (limited to 'ext/fileinfo/libmagic')
| -rw-r--r-- | ext/fileinfo/libmagic/softmagic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index b07dfb4c19..16edad2930 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -131,8 +131,8 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, if ((m->flag & BINTEST) != mode) { /* Skip sub-tests */ - while (magic[magindex + 1].cont_level != 0 && ++magindex < nmagic) { - continue; + while (magindex < nmagic - 1 && magic[magindex + 1].cont_level != 0) { + magindex++; } continue; /* Skip to next top-level test*/ } |