diff options
| author | delphij <delphij@FreeBSD.org> | 2014-12-10 08:26:53 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-12-10 08:26:53 +0000 |
| commit | b24390d7fc2b53f72a3836b662dcb05a1e026666 (patch) | |
| tree | 8859ec44a72911fc939fbd1c50288fb87e6db9f3 /contrib/file/src/file.h | |
| parent | 25ca306958f47d2bcf719496b52d5b1d9d9571c2 (diff) | |
| download | FreeBSD-src-b24390d7fc2b53f72a3836b662dcb05a1e026666.zip FreeBSD-src-b24390d7fc2b53f72a3836b662dcb05a1e026666.tar.gz | |
MFC r275666:
Fix multiple vulnerabilities in file(1) and libmagic(3).
Security: FreeBSD-SA-14:28.file
Security: CVE-2014-3710, CVE-2014-8116, CVE-2014-8117
Diffstat (limited to 'contrib/file/src/file.h')
| -rw-r--r-- | contrib/file/src/file.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/contrib/file/src/file.h b/contrib/file/src/file.h index 67a2568..1a652a8 100644 --- a/contrib/file/src/file.h +++ b/contrib/file/src/file.h @@ -482,6 +482,14 @@ protected int file_regexec(file_regex_t *, const char *, size_t, regmatch_t *, protected void file_regfree(file_regex_t *); protected void file_regerror(file_regex_t *, int, struct magic_set *); +typedef struct { + char *buf; + uint32_t offset; +} file_pushbuf_t; + +protected file_pushbuf_t *file_push_buffer(struct magic_set *); +protected char *file_pop_buffer(struct magic_set *, file_pushbuf_t *); + #ifndef COMPILE_ONLY extern const char *file_names[]; extern const size_t file_nnames; |
