diff -u libmagic.orig/apprentice.c libmagic/apprentice.c --- libmagic.orig/apprentice.c 2019-02-20 03:35:27.000000000 +0100 +++ libmagic/apprentice.c 2020-11-19 11:50:32.412674100 +0100 @@ -29,6 +29,8 @@ * apprentice - make one pass through /etc/magic, learning its secrets. */ +#include "php.h" + #include "file.h" #ifndef lint @@ -36,20 +38,33 @@ #endif /* lint */ #include "magic.h" +#include "patchlevel.h" #include <stdlib.h> -#ifdef HAVE_UNISTD_H + +#if defined(__hpux) && !defined(HAVE_STRTOULL) +#if SIZEOF_LONG == 8 +# define strtoull strtoul +#else +# define strtoull __strtoull +#endif +#endif + +#ifdef PHP_WIN32 +#include "win32/unistd.h" +#define strtoull _strtoui64 +#else #include <unistd.h> #endif -#include <stddef.h> #include <string.h> #include <assert.h> #include <ctype.h> #include <fcntl.h> -#ifdef QUICK -#include <sys/mman.h> + +#ifndef SSIZE_MAX +#define MAXMAGIC_SIZE ((ssize_t)0x7fffffff) +#else +#define MAXMAGIC_SIZE SSIZE_MAX #endif -#include <dirent.h> -#include <limits.h> #define EATAB {while (isascii(CAST(unsigned char, *l)) && \ @@ -66,6 +81,10 @@ #endif #endif +#ifndef offsetof +#define offsetof(STRUCTURE,FIELD) ((int)((char*)&((STRUCTURE*)0)->FIELD)) +#endif + #ifndef MAP_FAILED #define MAP_FAILED (void *) -1 #endif @@ -127,10 +146,7 @@ private uint32_t swap4(uint32_t); private uint64_t swap8(uint64_t); private char *mkdbname(struct magic_set *, const char *, int); -private struct magic_map *apprentice_buf(struct magic_set *, struct magic *, - size_t); private struct magic_map *apprentice_map(struct magic_set *, const char *); -private int check_buffer(struct magic_set *, struct magic_map *, const char *); private void apprentice_unmap(struct magic_map *); private int apprentice_compile(struct magic_set *, struct magic_map *, const char *); @@ -161,38 +177,7 @@ { NULL, 0, NULL } }; -#ifdef COMPILE_ONLY - -int main(int, char *[]); - -int -main(int argc, char *argv[]) -{ - int ret; - struct magic_set *ms; - char *progname; - - if ((progname = strrchr(argv[0], '/')) != NULL) - progname++; - else - progname = argv[0]; - - if (argc != 2) { - (void)fprintf(stderr, "Usage: %s file\n", progname); - return 1; - } - - if ((ms = magic_open(MAGIC_CHECK)) == NULL) { - (void)fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - return 1; - } - ret = magic_compile(ms, argv[1]) == -1 ? 1 : 0; - if (ret == 1) - (void)fprintf(stderr, "%s: %s\n", progname, magic_error(ms)); - magic_close(ms); - return ret; -} -#endif /* COMPILE_ONLY */ +#include "../data_file.c" struct type_tbl_s { const char name[16]; @@ -409,7 +394,7 @@ struct mlist *ml; mlp->map = NULL; - if ((ml = CAST(struct mlist *, malloc(sizeof(*ml)))) == NULL) + if ((ml = CAST(struct mlist *, emalloc(sizeof(*ml)))) == NULL) return -1; ml->map = idx == 0 ? map : NULL; @@ -430,10 +415,8 @@ apprentice_1(struct magic_set *ms, const char *fn, int action) { struct magic_map *map; -#ifndef COMPILE_ONLY struct mlist *ml; size_t i; -#endif if (magicsize != FILE_MAGICSIZE) { file_error(ms, 0, "magic element size %lu != %lu", @@ -449,14 +432,15 @@ return apprentice_compile(ms, map, fn); } -#ifndef COMPILE_ONLY map = apprentice_map(ms, fn); if (map == RCAST(struct magic_map *, -1)) return -1; if (map == NULL) { - if (ms->flags & MAGIC_CHECK) - file_magwarn(ms, "using regular magic file `%s'", fn); - map = apprentice_load(ms, fn, action); + if (fn) { + if (ms->flags & MAGIC_CHECK) + file_magwarn(ms, "using regular magic file `%s'", fn); + map = apprentice_load(ms, fn, action); + } if (map == NULL) return -1; } @@ -478,9 +462,6 @@ } } return 0; -#else - return 0; -#endif /* COMPILE_ONLY */ } protected void @@ -491,10 +472,16 @@ return; for (i = 0; i < MAGIC_SETS; i++) mlist_free(ms->mlist[i]); - free(ms->o.pbuf); - free(ms->o.buf); - free(ms->c.li); - free(ms); + if (ms->o.pbuf) { + efree(ms->o.pbuf); + } + if (ms->o.buf) { + efree(ms->o.buf); + } + if (ms->c.li) { + efree(ms->c.li); + } + efree(ms); } protected struct magic_set * @@ -503,7 +490,7 @@ struct magic_set *ms; size_t i, len; - if ((ms = CAST(struct magic_set *, calloc(CAST(size_t, 1u), + if ((ms = CAST(struct magic_set *, ecalloc(CAST(size_t, 1u), sizeof(struct magic_set)))) == NULL) return NULL; @@ -515,7 +502,7 @@ ms->o.buf = ms->o.pbuf = NULL; len = (ms->c.len = 10) * sizeof(*ms->c.li); - if ((ms->c.li = CAST(struct level_info *, malloc(len))) == NULL) + if ((ms->c.li = CAST(struct level_info *, emalloc(len))) == NULL) goto free; ms->event_flags = 0; @@ -533,48 +520,35 @@ ms->bytes_max = FILE_BYTES_MAX; return ms; free: - free(ms); + efree(ms); return NULL; } private void apprentice_unmap(struct magic_map *map) { - size_t i; if (map == NULL) return; - - switch (map->type) { - case MAP_TYPE_USER: - break; - case MAP_TYPE_MALLOC: - for (i = 0; i < MAGIC_SETS; i++) { - void *b = map->magic[i]; - void *p = map->p; - if (CAST(char *, b) >= CAST(char *, p) && - CAST(char *, b) <= CAST(char *, p) + map->len) - continue; - free(map->magic[i]); + if (map->p != php_magic_database) { + if (map->p == NULL) { + int j; + for (j = 0; j < MAGIC_SETS; j++) { + if (map->magic[j]) { + efree(map->magic[j]); + } + } + } else { + efree(map->p); } - free(map->p); - break; -#ifdef QUICK - case MAP_TYPE_MMAP: - if (map->p && map->p != MAP_FAILED) - (void)munmap(map->p, map->len); - break; -#endif - default: - abort(); } - free(map); + efree(map); } private struct mlist * mlist_alloc(void) { struct mlist *mlist; - if ((mlist = CAST(struct mlist *, calloc(1, sizeof(*mlist)))) == NULL) { + if ((mlist = CAST(struct mlist *, ecalloc(1, sizeof(*mlist)))) == NULL) { return NULL; } mlist->next = mlist->prev = mlist; @@ -586,7 +560,7 @@ { if (ml->map) apprentice_unmap(CAST(struct magic_map *, ml->map)); - free(ml); + efree(ml); } private void @@ -604,54 +578,6 @@ mlist_free_one(mlist); } -#ifndef COMPILE_ONLY -/* void **bufs: an array of compiled magic files */ -protected int -buffer_apprentice(struct magic_set *ms, struct magic **bufs, - size_t *sizes, size_t nbufs) -{ - size_t i, j; - struct mlist *ml; - struct magic_map *map; - - if (nbufs == 0) - return -1; - - (void)file_reset(ms, 0); - - init_file_tables(); - - for (i = 0; i < MAGIC_SETS; i++) { - mlist_free(ms->mlist[i]); - if ((ms->mlist[i] = mlist_alloc()) == NULL) { - file_oomem(ms, sizeof(*ms->mlist[i])); - goto fail; - } - } - - for (i = 0; i < nbufs; i++) { - map = apprentice_buf(ms, bufs[i], sizes[i]); - if (map == NULL) - goto fail; - - for (j = 0; j < MAGIC_SETS; j++) { - if (add_mlist(ms->mlist[j], map, j) == -1) { - file_oomem(ms, sizeof(*ml)); - goto fail; - } - } - } - - return 0; -fail: - for (i = 0; i < MAGIC_SETS; i++) { - mlist_free(ms->mlist[i]); - ms->mlist[i] = NULL; - } - return -1; -} -#endif - /* const char *fn: list of magic files and directories */ protected int file_apprentice(struct magic_set *ms, const char *fn, int action) @@ -662,12 +588,28 @@ (void)file_reset(ms, 0); +/* XXX disabling default magic loading so the compiled in data is used */ +#if 0 if ((fn = magic_getpath(fn, action)) == NULL) return -1; +#endif init_file_tables(); - if ((mfn = strdup(fn)) == NULL) { + if (fn == NULL) + fn = getenv("MAGIC"); + if (fn == NULL) { + for (i = 0; i < MAGIC_SETS; i++) { + mlist_free(ms->mlist[i]); + if ((ms->mlist[i] = mlist_alloc()) == NULL) { + file_oomem(ms, sizeof(*ms->mlist[i])); + return -1; + } + } + return apprentice_1(ms, fn, action); + } + + if ((mfn = estrdup(fn)) == NULL) { file_oomem(ms, strlen(fn)); return -1; } @@ -680,7 +622,7 @@ mlist_free(ms->mlist[i]); ms->mlist[i] = NULL; } - free(mfn); + efree(mfn); return -1; } } @@ -697,7 +639,7 @@ fn = p; } - free(mfn); + efree(mfn); if (errs == -1) { for (i = 0; i < MAGIC_SETS; i++) { @@ -1128,7 +1070,7 @@ mset[i].max += ALLOC_INCR; if ((mp = CAST(struct magic_entry *, - realloc(mset[i].me, sizeof(*mp) * mset[i].max))) == + erealloc(mset[i].me, sizeof(*mp) * mset[i].max))) == NULL) { file_oomem(ms, sizeof(*mp) * mset[i].max); return -1; @@ -1149,13 +1091,19 @@ load_1(struct magic_set *ms, int action, const char *fn, int *errs, struct magic_entry_set *mset) { - size_t lineno = 0, llen = 0; + char buffer[BUFSIZ + 1]; char *line = NULL; - ssize_t len; + size_t len; + size_t lineno = 0; struct magic_entry me; - FILE *f = fopen(ms->file = fn, "r"); - if (f == NULL) { + php_stream *stream; + + + ms->file = fn; + stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL); + + if (stream == NULL) { if (errno != ENOENT) file_error(ms, errno, "cannot read magic file `%s'", fn); @@ -1165,8 +1113,7 @@ memset(&me, 0, sizeof(me)); /* read and parse this file */ - for (ms->line = 1; (len = getline(&line, &llen, f)) != -1; - ms->line++) { + for (ms->line = 1; (line = php_stream_get_line(stream, buffer , BUFSIZ, &len)) != NULL; ms->line++) { if (len == 0) /* null line, garbage, etc */ continue; if (line[len - 1] == '\n') { @@ -1224,8 +1171,8 @@ } if (me.mp) (void)addentry(ms, &me, mset); - free(line); - (void)fclose(f); + efree(line); + php_stream_close(stream); } /* @@ -1304,7 +1251,7 @@ mentrycount += me[i].cont_count; slen = sizeof(**ma) * mentrycount; - if ((*ma = CAST(struct magic *, malloc(slen))) == NULL) { + if ((*ma = CAST(struct magic *, emalloc(slen))) == NULL) { file_oomem(ms, slen); return -1; } @@ -1326,8 +1273,8 @@ if (me == NULL) return; for (i = 0; i < nme; i++) - free(me[i].mp); - free(me); + efree(me[i].mp); + efree(me); } private struct magic_map * @@ -1336,18 +1283,19 @@ int errs = 0; uint32_t i, j; size_t files = 0, maxfiles = 0; - char **filearr = NULL, *mfn; - struct stat st; + char **filearr = NULL; + zend_stat_t st; struct magic_map *map; struct magic_entry_set mset[MAGIC_SETS]; - DIR *dir; - struct dirent *d; + php_stream *dir; + php_stream_dirent d; + memset(mset, 0, sizeof(mset)); ms->flags |= MAGIC_CHECK; /* Enable checks for parsed files */ - if ((map = CAST(struct magic_map *, calloc(1, sizeof(*map)))) == NULL) + if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) { file_oomem(ms, sizeof(*map)); return NULL; @@ -1359,24 +1307,26 @@ (void)fprintf(stderr, "%s\n", usg_hdr); /* load directory or file */ - if (stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) { - dir = opendir(fn); + /* FIXME: Read file names and sort them to prevent + non-determinism. See Debian bug #488562. */ + if (php_sys_stat(fn, &st) == 0 && S_ISDIR(st.st_mode)) { + int mflen; + char mfn[MAXPATHLEN]; + + dir = php_stream_opendir((char *)fn, REPORT_ERRORS, NULL); if (!dir) { errs++; goto out; } - while ((d = readdir(dir)) != NULL) { - if (d->d_name[0] == '.') - continue; - if (asprintf(&mfn, "%s/%s", fn, d->d_name) < 0) { + while (php_stream_readdir(dir, &d)) { + if ((mflen = snprintf(mfn, sizeof(mfn), "%s/%s", fn, d.d_name)) < 0) { file_oomem(ms, - strlen(fn) + strlen(d->d_name) + 2); + strlen(fn) + strlen(d.d_name) + 2); errs++; - closedir(dir); + php_stream_closedir(dir); goto out; } - if (stat(mfn, &st) == -1 || !S_ISREG(st.st_mode)) { - free(mfn); + if (zend_stat(mfn, &st) == -1 || !S_ISREG(st.st_mode)) { continue; } if (files >= maxfiles) { @@ -1384,24 +1334,23 @@ maxfiles = (maxfiles + 1) * 2; mlen = maxfiles * sizeof(*filearr); if ((filearr = CAST(char **, - realloc(filearr, mlen))) == NULL) { + erealloc(filearr, mlen))) == NULL) { file_oomem(ms, mlen); - free(mfn); - closedir(dir); + php_stream_closedir(dir); errs++; goto out; } } - filearr[files++] = mfn; + filearr[files++] = estrndup(mfn, (mflen > sizeof(mfn) - 1)? sizeof(mfn) - 1: mflen); } - closedir(dir); + php_stream_closedir(dir); if (filearr) { qsort(filearr, files, sizeof(*filearr), cmpstrp); for (i = 0; i < files; i++) { load_1(ms, action, filearr[i], &errs, mset); - free(filearr[i]); + efree(filearr[i]); } - free(filearr); + efree(filearr); } } else load_1(ms, action, fn, &errs, mset); @@ -1869,7 +1818,7 @@ if (me->cont_count == me->max_count) { struct magic *nm; size_t cnt = me->max_count + ALLOC_CHUNK; - if ((nm = CAST(struct magic *, realloc(me->mp, + if ((nm = CAST(struct magic *, erealloc(me->mp, sizeof(*nm) * cnt))) == NULL) { file_oomem(ms, sizeof(*nm) * cnt); return -1; @@ -1884,7 +1833,7 @@ static const size_t len = sizeof(*m) * ALLOC_CHUNK; if (me->mp != NULL) return 1; - if ((m = CAST(struct magic *, malloc(len))) == NULL) { + if ((m = CAST(struct magic *, emalloc(len))) == NULL) { file_oomem(ms, len); return -1; } @@ -1926,17 +1875,6 @@ file_magwarn(ms, "offset `%s' invalid", l); return -1; } -#if 0 - if (m->offset < 0 && cont_level != 0 && - (m->flag & (OFFADD | INDIROFFADD)) == 0) { - if (ms->flags & MAGIC_CHECK) { - file_magwarn(ms, - "negative direct offset `%s' at level %u", - l, cont_level); - } - return -1; - } -#endif l = t; if (m->flag & INDIR) { @@ -2106,7 +2044,7 @@ m->mask_op = 0; if (*l == '~') { - if (!IS_STRING(m->type)) + if (!IS_LIBMAGIC_STRING(m->type)) m->mask_op |= FILE_OPINVERSE; else if (ms->flags & MAGIC_CHECK) file_magwarn(ms, "'~' invalid for string types"); @@ -2115,7 +2053,7 @@ m->str_range = 0; m->str_flags = m->type == FILE_PSTRING ? PSTRING_1_LE : 0; if ((op = get_op(*l)) != -1) { - if (IS_STRING(m->type)) { + if (IS_LIBMAGIC_STRING(m->type)) { int r; if (op != FILE_OPDIVIDE) { @@ -2220,11 +2158,6 @@ if (check_format(ms, m) == -1) return -1; } -#ifndef COMPILE_ONLY - if (action == FILE_CHECK) { - file_mdump(m); - } -#endif m->mimetype[0] = '\0'; /* initialise MIME type to none */ return 0; } @@ -2296,7 +2229,7 @@ private int parse_extra(struct magic_set *ms, struct magic_entry *me, const char *line, - off_t off, size_t len, const char *name, const char *extra, int nt) + zend_off_t off, size_t len, const char *name, const char *extra, int nt) { size_t i; const char *l = line; @@ -2378,7 +2311,7 @@ struct magic *m = &me->mp[0]; return parse_extra(ms, me, line, - CAST(off_t, offsetof(struct magic, mimetype)), + CAST(zend_off_t, offsetof(struct magic, mimetype)), sizeof(m->mimetype), "MIME", "+-/.$?:{}", 1); } @@ -2657,14 +2590,19 @@ return -1; } if (m->type == FILE_REGEX) { - file_regex_t rx; - int rc = file_regcomp(&rx, m->value.s, REG_EXTENDED); - if (rc) { - if (ms->flags & MAGIC_CHECK) - file_regerror(&rx, rc, ms); + zval pattern; + int options = 0; + pcre_cache_entry *pce; + + convert_libmagic_pattern(&pattern, m->value.s, strlen(m->value.s), options); + + if ((pce = pcre_get_compiled_regex_cache(Z_STR(pattern))) == NULL) { + zval_dtor(&pattern); + return -1; } - file_regfree(&rx); - return rc ? -1 : 0; + zval_dtor(&pattern); + + return 0; } return 0; default: @@ -3010,6 +2948,7 @@ *p = l; } +#if 0 /* * handle a buffer containing a compiled file. */ @@ -3031,6 +2970,7 @@ } return map; } +#endif /* * handle a compiled file. @@ -3039,81 +2979,147 @@ private struct magic_map * apprentice_map(struct magic_set *ms, const char *fn) { - int fd; - struct stat st; + uint32_t *ptr; + uint32_t version, entries = 0, nentries; + int needsbyteswap; char *dbname = NULL; struct magic_map *map; - struct magic_map *rv = NULL; + size_t i; + php_stream *stream = NULL; + php_stream_statbuf st; - fd = -1; - if ((map = CAST(struct magic_map *, calloc(1, sizeof(*map)))) == NULL) { + + + if ((map = CAST(struct magic_map *, ecalloc(1, sizeof(*map)))) == NULL) { file_oomem(ms, sizeof(*map)); - goto error; + return NULL; + } + + if (fn == NULL) { + map->p = (void *)&php_magic_database; + goto internal_loaded; } - map->type = MAP_TYPE_USER; /* unspecified */ + +#ifdef PHP_WIN32 + /* Don't bother on windows with php_stream_open_wrapper, + return to give apprentice_load() a chance. */ + if (php_stream_stat_path_ex((char *)fn, 0, &st, NULL) == SUCCESS) { + if (st.sb.st_mode & S_IFDIR) { + goto error; + } + } +#endif dbname = mkdbname(ms, fn, 0); if (dbname == NULL) goto error; - if ((fd = open(dbname, O_RDONLY|O_BINARY)) == -1) + stream = php_stream_open_wrapper((char *)fn, "rb", REPORT_ERRORS, NULL); + + if (!stream) { goto error; + } - if (fstat(fd, &st) == -1) { +#ifndef PHP_WIN32 + if (php_stream_stat(stream, &st) < 0) { file_error(ms, errno, "cannot stat `%s'", dbname); goto error; } - if (st.st_size < 8 || st.st_size > maxoff_t()) { +#endif + if (st.sb.st_size < 8 || st.sb.st_size > maxoff_t()) { file_error(ms, 0, "file `%s' is too %s", dbname, - st.st_size < 8 ? "small" : "large"); + st.sb.st_size < 8 ? "small" : "large"); goto error; } - map->len = CAST(size_t, st.st_size); -#ifdef QUICK - map->type = MAP_TYPE_MMAP; - if ((map->p = mmap(0, CAST(size_t, st.st_size), PROT_READ|PROT_WRITE, - MAP_PRIVATE|MAP_FILE, fd, CAST(off_t, 0))) == MAP_FAILED) { - file_error(ms, errno, "cannot map `%s'", dbname); - goto error; - } -#else map->type = MAP_TYPE_MALLOC; - if ((map->p = CAST(void *, malloc(map->len))) == NULL) { - file_oomem(ms, map->len); - goto error; - } - if (read(fd, map->p, map->len) != (ssize_t)map->len) { + map->len = CAST(size_t, st.sb.st_size); + map->p = CAST(void *, emalloc(map->len)); + + if (php_stream_read(stream, map->p, (size_t)st.sb.st_size) != (size_t)st.sb.st_size) { file_badread(ms); goto error; } -#define RET 1 -#endif - (void)close(fd); - fd = -1; - if (check_buffer(ms, map, dbname) != 0) { - rv = RCAST(struct magic_map *, -1); + php_stream_close(stream); + stream = NULL; + +internal_loaded: + ptr = (uint32_t *)(void *)map->p; + if (*ptr != MAGICNO) { + if (swap4(*ptr) != MAGICNO) { + file_error(ms, 0, "bad magic in `%s'", dbname); + goto error; + } + needsbyteswap = 1; + } else + needsbyteswap = 0; + if (needsbyteswap) + version = swap4(ptr[1]); + else + version = ptr[1]; + if (version != VERSIONNO) { + file_error(ms, 0, "File %d.%d supports only version %d magic " + "files. `%s' is version %d", FILE_VERSION_MAJOR, patchlevel, + VERSIONNO, dbname, version); goto error; } -#ifdef QUICK - if (mprotect(map->p, CAST(size_t, st.st_size), PROT_READ) == -1) { - file_error(ms, errno, "cannot mprotect `%s'", dbname); + + /* php_magic_database is a const, performing writes will segfault. This is for big-endian + machines only, PPC and Sparc specifically. Consider static variable or MINIT in + future. */ + if (needsbyteswap && fn == NULL) { + map->p = emalloc(sizeof(php_magic_database)); + map->p = memcpy(map->p, php_magic_database, sizeof(php_magic_database)); + } + + if (NULL != fn) { + nentries = (uint32_t)(st.sb.st_size / sizeof(struct magic)); + entries = (uint32_t)(st.sb.st_size / sizeof(struct magic)); + if ((zend_off_t)(entries * sizeof(struct magic)) != st.sb.st_size) { + file_error(ms, 0, "Size of `%s' %llu is not a multiple of %zu", + dbname, (unsigned long long)st.sb.st_size, + sizeof(struct magic)); + goto error; + } + } + map->magic[0] = CAST(struct magic *, map->p) + 1; + nentries = 0; + for (i = 0; i < MAGIC_SETS; i++) { + if (needsbyteswap) + map->nmagic[i] = swap4(ptr[i + 2]); + else + map->nmagic[i] = ptr[i + 2]; + if (i != MAGIC_SETS - 1) + map->magic[i + 1] = map->magic[i] + map->nmagic[i]; + nentries += map->nmagic[i]; + } + if (NULL != fn && entries != nentries + 1) { + file_error(ms, 0, "Inconsistent entries in `%s' %u != %u", + dbname, entries, nentries + 1); goto error; } -#endif + if (needsbyteswap) + for (i = 0; i < MAGIC_SETS; i++) + byteswap(map->magic[i], map->nmagic[i]); - free(dbname); + if (dbname) { + efree(dbname); + } return map; error: - if (fd != -1) - (void)close(fd); + if (stream) { + php_stream_close(stream); + } apprentice_unmap(map); - free(dbname); - return rv; + if (dbname) { + efree(dbname); + } + return NULL; } +#if 0 private int check_buffer(struct magic_set *ms, struct magic_map *map, const char *dbname) { @@ -3137,7 +3143,7 @@ version = ptr[1]; if (version != VERSIONNO) { file_error(ms, 0, "File %s supports only version %d magic " - "files. `%s' is version %d", VERSION, + "files. `%s' is version %d", FILE_VERSION_MAJOR, VERSIONNO, dbname, version); return -1; } @@ -3169,6 +3175,7 @@ byteswap(map->magic[i], map->nmagic[i]); return 0; } +#endif /* * handle an mmaped file. @@ -3178,7 +3185,6 @@ { static const size_t nm = sizeof(*map->nmagic) * MAGIC_SETS; static const size_t m = sizeof(**map->magic); - int fd = -1; size_t len; char *dbname; int rv = -1; @@ -3187,14 +3193,17 @@ struct magic m; uint32_t h[2 + MAGIC_SETS]; } hdr; + php_stream *stream; dbname = mkdbname(ms, fn, 1); if (dbname == NULL) goto out; - if ((fd = open(dbname, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0644)) == -1) - { + /* wb+ == O_WRONLY|O_CREAT|O_TRUNC|O_BINARY */ + stream = php_stream_open_wrapper((char *)fn, "wb+", REPORT_ERRORS, NULL); + + if (!stream) { file_error(ms, errno, "cannot open `%s'", dbname); goto out; } @@ -3203,26 +3212,25 @@ hdr.h[1] = VERSIONNO; memcpy(hdr.h + 2, map->nmagic, nm); - if (write(fd, &hdr, sizeof(hdr)) != CAST(ssize_t, sizeof(hdr))) { + if (php_stream_write(stream,(const char *)&hdr, sizeof(hdr)) != (ssize_t)sizeof(hdr)) { file_error(ms, errno, "error writing `%s'", dbname); - goto out2; + goto out; } for (i = 0; i < MAGIC_SETS; i++) { len = m * map->nmagic[i]; - if (write(fd, map->magic[i], len) != CAST(ssize_t, len)) { + if (php_stream_write(stream, (const char *)map->magic[i], len) != (ssize_t)len) { file_error(ms, errno, "error writing `%s'", dbname); - goto out2; + goto out; } } + if (stream) { + php_stream_close(stream); + } rv = 0; -out2: - if (fd != -1) - (void)close(fd); out: - apprentice_unmap(map); - free(dbname); + efree(dbname); return rv; } @@ -3256,17 +3264,18 @@ q++; /* Compatibility with old code that looked in .mime */ if (ms->flags & MAGIC_MIME) { - if (asprintf(&buf, "%.*s.mime%s", CAST(int, q - fn), fn, ext) - < 0) - return NULL; - if (access(buf, R_OK) != -1) { + spprintf(&buf, MAXPATHLEN, "%.*s.mime%s", CAST(int, q - fn), fn, ext); +#ifdef PHP_WIN32 + if (VCWD_ACCESS(buf, R_OK) == 0) { +#else + if (VCWD_ACCESS(buf, R_OK) != -1) { +#endif ms->flags &= MAGIC_MIME_TYPE; return buf; } - free(buf); + efree(buf); } - if (asprintf(&buf, "%.*s%s", CAST(int, q - fn), fn, ext) < 0) - return NULL; + spprintf(&buf, MAXPATHLEN, "%.*s%s", CAST(int, q - fn), fn, ext); /* Compatibility with old code that looked in .mime */ if (strstr(fn, ".mime") != NULL) @@ -3356,7 +3365,7 @@ m->offset = swap4(CAST(uint32_t, m->offset)); m->in_offset = swap4(CAST(uint32_t, m->in_offset)); m->lineno = swap4(CAST(uint32_t, m->lineno)); - if (IS_STRING(m->type)) { + if (IS_LIBMAGIC_STRING(m->type)) { m->str_range = swap4(m->str_range); m->str_flags = swap4(m->str_flags); } diff -u libmagic.orig/ascmagic.c libmagic/ascmagic.c --- libmagic.orig/ascmagic.c 2019-05-07 04:27:11.000000000 +0200 +++ libmagic/ascmagic.c 2020-09-07 00:42:14.447562400 +0200 @@ -96,7 +96,7 @@ rv = file_ascmagic_with_encoding(ms, &bb, ubuf, ulen, code, type, text); - free(ubuf); + efree(ubuf); return rv; } @@ -144,7 +144,7 @@ /* malloc size is a conservative overestimate; could be improved, or at least realloced after conversion. */ mlen = ulen * 6; - if ((utf8_buf = CAST(unsigned char *, malloc(mlen))) == NULL) { + if ((utf8_buf = CAST(unsigned char *, emalloc(mlen))) == NULL) { file_oomem(ms, mlen); goto done; } @@ -327,7 +327,8 @@ } rv = 1; done: - free(utf8_buf); + if (utf8_buf) + efree(utf8_buf); return rv; } diff -u libmagic.orig/buffer.c libmagic/buffer.c --- libmagic.orig/buffer.c 2019-05-07 04:27:11.000000000 +0200 +++ libmagic/buffer.c 2020-09-07 00:42:14.447562400 +0200 @@ -31,19 +31,23 @@ #endif /* lint */ #include "magic.h" +#ifdef PHP_WIN32 +#include "win32/unistd.h" +#else #include <unistd.h> +#endif #include <string.h> #include <stdlib.h> #include <sys/stat.h> void -buffer_init(struct buffer *b, int fd, const struct stat *st, const void *data, +buffer_init(struct buffer *b, int fd, const zend_stat_t *st, const void *data, size_t len) { b->fd = fd; if (st) memcpy(&b->st, st, sizeof(b->st)); - else if (b->fd == -1 || fstat(b->fd, &b->st) == -1) + else if (b->fd == -1 || zend_fstat(b->fd, &b->st) == -1) memset(&b->st, 0, sizeof(b->st)); b->fbuf = data; b->flen = len; @@ -55,7 +59,7 @@ void buffer_fini(struct buffer *b) { - free(b->ebuf); + efree(b->ebuf); } int @@ -71,12 +75,15 @@ b->elen = CAST(size_t, b->st.st_size) < b->flen ? CAST(size_t, b->st.st_size) : b->flen; - if ((b->ebuf = malloc(b->elen)) == NULL) + if ((b->ebuf = emalloc(b->elen)) == NULL) goto out; b->eoff = b->st.st_size - b->elen; - if (pread(b->fd, b->ebuf, b->elen, b->eoff) == -1) { - free(b->ebuf); + if (FINFO_LSEEK_FUNC(b->fd, b->eoff, SEEK_SET) == (zend_off_t)-1 || + FINFO_READ_FUNC(b->fd, b->ebuf, b->elen) != (ssize_t)b->elen) + { + efree(b->ebuf); + b->ebuf = NULL; goto out; } diff -u libmagic.orig/cdf.c libmagic/cdf.c --- libmagic.orig/cdf.c 2019-02-20 03:35:27.000000000 +0100 +++ libmagic/cdf.c 2020-09-07 00:42:14.447562400 +0200 @@ -43,7 +43,17 @@ #include <err.h> #endif #include <stdlib.h> + +#ifdef PHP_WIN32 +#include "win32/unistd.h" +#else #include <unistd.h> +#endif + +#ifndef UINT32_MAX +# define UINT32_MAX (0xffffffff) +#endif + #include <string.h> #include <time.h> #include <ctype.h> @@ -81,40 +91,9 @@ CDF_TOLE8(CAST(uint64_t, x)))) #define CDF_GETUINT32(x, y) cdf_getuint32(x, y) -#define CDF_MALLOC(n) cdf_malloc(__FILE__, __LINE__, (n)) -#define CDF_REALLOC(p, n) cdf_realloc(__FILE__, __LINE__, (p), (n)) -#define CDF_CALLOC(n, u) cdf_calloc(__FILE__, __LINE__, (n), (u)) - - -/*ARGSUSED*/ -static void * -cdf_malloc(const char *file __attribute__((__unused__)), - size_t line __attribute__((__unused__)), size_t n) -{ - DPRINTF(("%s,%" SIZE_T_FORMAT "u: %s %" SIZE_T_FORMAT "u\n", - file, line, __func__, n)); - return malloc(n); -} - -/*ARGSUSED*/ -static void * -cdf_realloc(const char *file __attribute__((__unused__)), - size_t line __attribute__((__unused__)), void *p, size_t n) -{ - DPRINTF(("%s,%" SIZE_T_FORMAT "u: %s %" SIZE_T_FORMAT "u\n", - file, line, __func__, n)); - return realloc(p, n); -} - -/*ARGSUSED*/ -static void * -cdf_calloc(const char *file __attribute__((__unused__)), - size_t line __attribute__((__unused__)), size_t n, size_t u) -{ - DPRINTF(("%s,%" SIZE_T_FORMAT "u: %s %" SIZE_T_FORMAT "u %" - SIZE_T_FORMAT "u\n", file, line, __func__, n, u)); - return calloc(n, u); -} +#define CDF_MALLOC(n) emalloc(n) +#define CDF_REALLOC(p, n) erealloc(p, n) +#define CDF_CALLOC(n, u) ecalloc(n, u) /* * swap a short @@ -310,7 +289,7 @@ scn->sst_len = 0; scn->sst_dirlen = 0; scn->sst_ss = 0; - free(scn->sst_tab); + efree(scn->sst_tab); scn->sst_tab = NULL; return -1; } @@ -318,9 +297,11 @@ static size_t cdf_check_stream(const cdf_stream_t *sst, const cdf_header_t *h) { +#ifndef NDEBUG size_t ss = sst->sst_dirlen < h->h_min_size_standard_stream ? CDF_SHORT_SEC_SIZE(h) : CDF_SEC_SIZE(h); assert(ss == sst->sst_ss); +#endif return sst->sst_ss; } @@ -343,11 +324,11 @@ } static ssize_t -cdf_read(const cdf_info_t *info, off_t off, void *buf, size_t len) +cdf_read(const cdf_info_t *info, zend_off_t off, void *buf, size_t len) { size_t siz = CAST(size_t, off + len); - if (CAST(off_t, off + len) != CAST(off_t, siz)) + if (CAST(zend_off_t, off + len) != CAST(zend_off_t, siz)) goto out; if (info->i_buf != NULL && info->i_len >= siz) { @@ -358,7 +339,10 @@ if (info->i_fd == -1) goto out; - if (pread(info->i_fd, buf, len, off) != CAST(ssize_t, len)) + if (FINFO_LSEEK_FUNC(info->i_fd, off, SEEK_SET) == (zend_off_t)-1) + return -1; + + if (FINFO_READ_FUNC(info->i_fd, buf, len) != (ssize_t)len) return -1; return CAST(ssize_t, len); @@ -373,7 +357,7 @@ char buf[512]; (void)memcpy(cdf_bo.s, "\01\02\03\04", 4); - if (cdf_read(info, CAST(off_t, 0), buf, sizeof(buf)) == -1) + if (cdf_read(info, CAST(zend_off_t, 0), buf, sizeof(buf)) == -1) return -1; cdf_unpack_header(h, buf); cdf_swap_header(h); @@ -404,19 +388,17 @@ cdf_read_sector(const cdf_info_t *info, void *buf, size_t offs, size_t len, const cdf_header_t *h, cdf_secid_t id) { - size_t ss = CDF_SEC_SIZE(h); size_t pos = CDF_SEC_POS(h, id); - assert(ss == len); - return cdf_read(info, CAST(off_t, pos), RCAST(char *, buf) + offs, len); + assert(CDF_SEC_SIZE(h) == len); + return cdf_read(info, CAST(zend_off_t, pos), RCAST(char *, buf) + offs, len); } ssize_t cdf_read_short_sector(const cdf_stream_t *sst, void *buf, size_t offs, size_t len, const cdf_header_t *h, cdf_secid_t id) { - size_t ss = CDF_SHORT_SEC_SIZE(h); size_t pos = CDF_SHORT_SEC_POS(h, id); - assert(ss == len); + assert(CDF_SHORT_SEC_SIZE(h) == len); if (pos + len > CDF_SEC_SIZE(h) * sst->sst_len) { DPRINTF(("Out of bounds read %" SIZE_T_FORMAT "u > %" SIZE_T_FORMAT "u\n", @@ -510,14 +492,14 @@ } out: sat->sat_len = i; - free(msa); + efree(msa); return 0; out3: errno = EFTYPE; out2: - free(msa); + efree(msa); out1: - free(sat->sat_tab); + efree(sat->sat_tab); return -1; } @@ -685,7 +667,7 @@ return -1; if ((buf = CAST(char *, CDF_MALLOC(ss))) == NULL) { - free(dir->dir_tab); + efree(dir->dir_tab); return -1; } @@ -708,11 +690,11 @@ if (NEED_SWAP) for (i = 0; i < dir->dir_len; i++) cdf_swap_dir(&dir->dir_tab[i]); - free(buf); + efree(buf); return 0; out: - free(dir->dir_tab); - free(buf); + efree(dir->dir_tab); + efree(buf); errno = EFTYPE; return -1; } @@ -757,7 +739,7 @@ out: errno = EFTYPE; out1: - free(ssat->sat_tab); + efree(ssat->sat_tab); return -1; } @@ -919,7 +901,7 @@ *maxcount = newcount; return inp; out: - free(*info); + efree(*info); *maxcount = 0; *info = NULL; return NULL; @@ -1013,8 +995,9 @@ goto out; } nelements = CDF_GETUINT32(q, 1); - if (nelements == 0) { - DPRINTF(("CDF_VECTOR with nelements == 0\n")); + if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) { + DPRINTF(("CDF_VECTOR with nelements == %" + SIZE_T_FORMAT "u\n", nelements)); goto out; } slen = 2; @@ -1056,8 +1039,6 @@ goto out; inp += nelem; } - DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n", - nelements)); for (j = 0; j < nelements && i < sh.sh_properties; j++, i++) { @@ -1102,7 +1083,7 @@ } return 0; out: - free(*info); + efree(*info); *info = NULL; *count = 0; *maxcount = 0; @@ -1394,7 +1375,7 @@ cdf_directory_t *d; char name[__arraycount(d->d_name)]; cdf_stream_t scn; - struct timespec ts; + struct timeval ts; static const char *types[] = { "empty", "user storage", "user stream", "lockbytes", "property", "root storage" }; @@ -1436,7 +1417,7 @@ break; } cdf_dump_stream(&scn); - free(scn.sst_tab); + efree(scn.sst_tab); break; default: break; @@ -1449,7 +1430,7 @@ cdf_dump_property_info(const cdf_property_info_t *info, size_t count) { cdf_timestamp_t tp; - struct timespec ts; + struct timeval ts; char buf[64]; size_t i, j; @@ -1534,7 +1515,7 @@ (void)fprintf(stderr, "Class %s\n", buf); (void)fprintf(stderr, "Count %d\n", ssi.si_count); cdf_dump_property_info(info, count); - free(info); + efree(info); } @@ -1555,7 +1536,7 @@ cdf_u16tos8(sbuf, ce[i].ce_namlen, ce[i].ce_name), cdf_ctime(&ts.tv_sec, tbuf)); } - free(cat); + efree(cat); } #endif diff -u libmagic.orig/cdf.h libmagic/cdf.h --- libmagic.orig/cdf.h 2019-02-20 02:24:19.000000000 +0100 +++ libmagic/cdf.h 2020-09-07 00:42:14.447562400 +0200 @@ -35,10 +35,10 @@ #ifndef _H_CDF_ #define _H_CDF_ -#ifdef WIN32 +#ifdef PHP_WIN32 #include <winsock2.h> -#define timespec timeval -#define tv_nsec tv_usec +#define asctime_r php_asctime_r +#define ctime_r php_ctime_r #endif #ifdef __DJGPP__ #define timespec timeval @@ -48,6 +48,7 @@ typedef int32_t cdf_secid_t; #define CDF_LOOP_LIMIT 10000 +#define CDF_ELEMENT_LIMIT 100000 #define CDF_SECID_NULL 0 #define CDF_SECID_FREE -1 diff -u libmagic.orig/cdf_time.c libmagic/cdf_time.c --- libmagic.orig/cdf_time.c 2019-03-12 21:43:05.000000000 +0100 +++ libmagic/cdf_time.c 2020-09-07 00:42:14.447562400 +0200 @@ -23,6 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include "php.h" #include "file.h" @@ -152,7 +153,7 @@ #endif #ifdef notyet struct tm tm; - if (gmtime_r(&ts->ts_sec, &tm) == NULL) { + if (php_gmtime_r(&ts->ts_sec, &tm) == NULL) { errno = EINVAL; return -1; } @@ -168,7 +169,7 @@ char * cdf_ctime(const time_t *sec, char *buf) { - char *ptr = ctime_r(sec, buf); + char *ptr = php_ctime_r(sec, buf); if (ptr != NULL) return buf; (void)snprintf(buf, 26, "*Bad* %#16.16" INT64_T_FORMAT "x\n", diff -u libmagic.orig/compress.c libmagic/compress.c --- libmagic.orig/compress.c 2019-05-07 04:27:11.000000000 +0200 +++ libmagic/compress.c 2020-09-07 00:42:14.447562400 +0200 @@ -45,13 +45,11 @@ #endif #include <string.h> #include <errno.h> -#include <ctype.h> -#include <stdarg.h> #include <signal.h> #ifndef HAVE_SIG_T typedef void (*sig_t)(int); #endif /* HAVE_SIG_T */ -#if !defined(__MINGW32__) && !defined(WIN32) +#ifndef PHP_WIN32 #include <sys/ioctl.h> #endif #ifdef HAVE_SYS_WAIT_H @@ -60,13 +58,14 @@ #if defined(HAVE_SYS_TIME_H) #include <sys/time.h> #endif - -#if defined(HAVE_ZLIB_H) && defined(ZLIBSUPPORT) +#if defined(HAVE_ZLIB_H) && defined(PHP_FILEINFO_UNCOMPRESS) #define BUILTIN_DECOMPRESS #include <zlib.h> #endif -#if defined(HAVE_BZLIB_H) +#undef FIONREAD + +#if defined(PHP_FILEINFO_UNCOMPRESS) #define BUILTIN_BZLIB #include <bzlib.h> #endif @@ -116,6 +115,7 @@ #define gzip_flags "-cd" #define lrzip_flags "-do" #define lzip_flags gzip_flags +#ifdef PHP_FILEINFO_UNCOMPRESS static const char *gzip_args[] = { "gzip", gzip_flags, NULL @@ -193,8 +193,7 @@ size_t *, int); #endif -static int makeerror(unsigned char **, size_t *, const char *, ...) - __attribute__((__format__(__printf__, 3, 4))); +static int makeerror(unsigned char **, size_t *, const char *, ...); private const char *methodname(size_t); private int @@ -267,7 +266,7 @@ if (urv == ERRDATA) prv = format_decompression_error(ms, i, newbuf); else - prv = file_buffer(ms, -1, NULL, name, newbuf, nsz); + prv = file_buffer(ms, NULL, NULL, name, newbuf, nsz); if (prv == -1) goto error; rv = 1; @@ -284,17 +283,17 @@ * XXX: If file_buffer fails here, we overwrite * the compressed text. FIXME. */ - if (file_buffer(ms, -1, NULL, NULL, buf, nbytes) == -1) { + if (file_buffer(ms, NULL, NULL, NULL, buf, nbytes) == -1) { if (file_pop_buffer(ms, pb) != NULL) abort(); goto error; } if ((rbuf = file_pop_buffer(ms, pb)) != NULL) { if (file_printf(ms, "%s", rbuf) == -1) { - free(rbuf); + efree(rbuf); goto error; } - free(rbuf); + efree(rbuf); } if (!mime && file_printf(ms, ")") == -1) goto error; @@ -315,7 +314,8 @@ if (sa_saved && sig_act.sa_handler != SIG_IGN) (void)sigaction(SIGPIPE, &sig_act, NULL); - free(newbuf); + if (newbuf) + efree(newbuf); ms->flags |= MAGIC_COMPRESS; DPRINTF("Zmagic returns %d\n", rv); return rv; @@ -350,7 +350,7 @@ * `safe' read for sockets and pipes. */ protected ssize_t -sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__))) +sread(int fd, void *buf, size_t n, int canbepipe) { ssize_t rv; #ifdef FIONREAD @@ -398,7 +398,7 @@ nocheck: do - switch ((rv = read(fd, buf, n))) { + switch ((rv = FINFO_READ_FUNC(fd, buf, n))) { case -1: if (errno == EINTR) continue; @@ -434,7 +434,6 @@ #else { int te; - mode_t ou = umask(0); tfd = mkstemp(buf); (void)umask(ou); te = errno; @@ -477,13 +476,13 @@ return -1; } (void)close(tfd); - if (lseek(fd, CAST(off_t, 0), SEEK_SET) == CAST(off_t, -1)) { + if (FINFO_LSEEK_FUNC(fd, (zend_off_t)0, SEEK_SET) == (zend_off_t)-1) { file_badseek(ms); return -1; } return fd; } -#if HAVE_FORK +#ifdef PHP_FILEINFO_UNCOMPRESS #ifdef BUILTIN_DECOMPRESS #define FHCRC (1 << 1) @@ -534,7 +533,7 @@ int rc; z_stream z; - if ((*newch = CAST(unsigned char *, malloc(bytes_max + 1))) == NULL) + if ((*newch = CAST(unsigned char *, emalloc(bytes_max + 1))) == NULL) return makeerror(newch, n, "No buffer, %s", strerror(errno)); z.next_in = CCAST(Bytef *, old); @@ -831,3 +830,4 @@ return rv; } #endif +#endif diff -u libmagic.orig/der.c libmagic/der.c --- libmagic.orig/der.c 2019-02-20 03:35:27.000000000 +0100 +++ libmagic/der.c 2020-09-07 00:42:14.447562400 +0200 @@ -51,7 +51,9 @@ #include "magic.h" #include "der.h" #else +#ifndef PHP_WIN32 #include <sys/mman.h> +#endif #include <sys/stat.h> #include <err.h> #endif @@ -218,6 +220,7 @@ static int der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len) { + uint32_t i = 0; const uint8_t *d = CAST(const uint8_t *, q); switch (tag) { case DER_TAG_PRINTABLE_STRING: @@ -229,7 +232,7 @@ break; } - for (uint32_t i = 0; i < len; i++) { + for (; i < len; i++) { uint32_t z = i << 1; if (z < blen - 2) snprintf(buf + z, blen - z, "%.2x", d[i]); diff -u libmagic.orig/elfclass.h libmagic/elfclass.h --- libmagic.orig/elfclass.h 2019-02-20 02:30:19.000000000 +0100 +++ libmagic/elfclass.h 2020-09-07 00:42:14.447562400 +0200 @@ -41,7 +41,7 @@ return toomany(ms, "program headers", phnum); flags |= FLAGS_IS_CORE; if (dophn_core(ms, clazz, swap, fd, - CAST(off_t, elf_getu(swap, elfhdr.e_phoff)), phnum, + CAST(zend_off_t, elf_getu(swap, elfhdr.e_phoff)), phnum, CAST(size_t, elf_getu16(swap, elfhdr.e_phentsize)), fsize, &flags, &notecount) == -1) return -1; @@ -56,7 +56,7 @@ if (shnum > ms->elf_shnum_max) return toomany(ms, "section", shnum); if (dophn_exec(ms, clazz, swap, fd, - CAST(off_t, elf_getu(swap, elfhdr.e_phoff)), phnum, + CAST(zend_off_t, elf_getu(swap, elfhdr.e_phoff)), phnum, CAST(size_t, elf_getu16(swap, elfhdr.e_phentsize)), fsize, shnum, &flags, &notecount) == -1) return -1; @@ -66,7 +66,7 @@ if (shnum > ms->elf_shnum_max) return toomany(ms, "section headers", shnum); if (doshn(ms, clazz, swap, fd, - CAST(off_t, elf_getu(swap, elfhdr.e_shoff)), shnum, + CAST(zend_off_t, elf_getu(swap, elfhdr.e_shoff)), shnum, CAST(size_t, elf_getu16(swap, elfhdr.e_shentsize)), fsize, elf_getu16(swap, elfhdr.e_machine), CAST(int, elf_getu16(swap, elfhdr.e_shstrndx)), diff -u libmagic.orig/encoding.c libmagic/encoding.c --- libmagic.orig/encoding.c 2019-04-15 18:48:41.000000000 +0200 +++ libmagic/encoding.c 2020-09-07 00:42:14.447562400 +0200 @@ -89,13 +89,13 @@ *code_mime = "binary"; mlen = (nbytes + 1) * sizeof((*ubuf)[0]); - if ((*ubuf = CAST(unichar *, calloc(CAST(size_t, 1), mlen))) == NULL) { + if ((*ubuf = CAST(unichar *, ecalloc(CAST(size_t, 1), mlen))) == NULL) { file_oomem(ms, mlen); goto done; } mlen = (nbytes + 1) * sizeof(nbuf[0]); if ((nbuf = CAST(unsigned char *, - calloc(CAST(size_t, 1), mlen))) == NULL) { + ecalloc(CAST(size_t, 1), mlen))) == NULL) { file_oomem(ms, mlen); goto done; } @@ -164,9 +164,9 @@ } done: - free(nbuf); + efree(nbuf); if (ubuf == &udefbuf) - free(udefbuf); + efree(udefbuf); return rv; } diff -u libmagic.orig/file.h libmagic/file.h --- libmagic.orig/file.h 2019-05-07 04:27:11.000000000 +0200 +++ libmagic/file.h 2020-11-23 17:11:36.234964700 +0100 @@ -33,18 +33,9 @@ #ifndef __file_h__ #define __file_h__ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#ifdef HAVE_STDINT_H -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS -#endif -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS -#endif +#include "config.h" -#ifdef WIN32 +#ifdef PHP_WIN32 #ifdef _WIN64 #define SIZE_T_FORMAT "I64" #else @@ -57,32 +48,49 @@ #define INT64_T_FORMAT "ll" #define INTMAX_T_FORMAT "j" #endif -#include <stdint.h> -#endif #include <stdio.h> /* Include that here, to make sure __P gets defined */ #include <errno.h> #include <fcntl.h> /* For open and flags */ +#ifdef HAVE_STDINT_H +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS +#endif +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS +#endif +#include <stdint.h> +#endif #ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif -#include <regex.h> -#include <time.h> +#ifdef PHP_WIN32 +#include "win32/php_stdint.h" +#endif + +#include "php.h" +#include "ext/standard/php_string.h" +#include "ext/pcre/php_pcre.h" + #include <sys/types.h> -#ifndef WIN32 +#ifdef PHP_WIN32 +#include "win32/param.h" +#else #include <sys/param.h> #endif /* Do this here and now, because struct stat gets re-defined on solaris */ #include <sys/stat.h> #include <stdarg.h> +#define abort() zend_error_noreturn(E_ERROR, "fatal libmagic error") + #define ENABLE_CONDITIONALS #ifndef MAGIC #define MAGIC "/etc/magic" #endif -#if defined(__EMX__) || defined (WIN32) +#if defined(__EMX__) || defined(PHP_WIN32) #define PATHSEP ';' #else #define PATHSEP ':' @@ -116,12 +124,6 @@ #endif #endif -#ifndef __GNUC__ -#ifndef __attribute__ -#define __attribute__(a) -#endif -#endif - #ifndef MIN #define MIN(a,b) (((a) < (b)) ? (a) : (b)) #endif @@ -150,10 +152,10 @@ struct buffer { int fd; - struct stat st; + zend_stat_t st; const void *fbuf; size_t flen; - off_t eoff; + zend_off_t eoff; void *ebuf; size_t elen; }; @@ -243,7 +245,7 @@ #define FILE_DER 48 #define FILE_NAMES_SIZE 49 /* size of array to contain all names */ -#define IS_STRING(t) \ +#define IS_LIBMAGIC_STRING(t) \ ((t) == FILE_STRING || \ (t) == FILE_PSTRING || \ (t) == FILE_BESTRING16 || \ @@ -447,28 +449,23 @@ /* Type for Unicode characters */ typedef unsigned long unichar; -struct stat; #define FILE_T_LOCAL 1 #define FILE_T_WINDOWS 2 protected const char *file_fmttime(uint64_t, int, char *); protected struct magic_set *file_ms_alloc(int); protected void file_ms_free(struct magic_set *); -protected int file_default(struct magic_set *, size_t); -protected int file_buffer(struct magic_set *, int, struct stat *, const char *, - const void *, size_t); -protected int file_fsmagic(struct magic_set *, const char *, struct stat *); +protected int file_buffer(struct magic_set *, php_stream *, zend_stat_t *, const char *, const void *, + size_t); +protected int file_fsmagic(struct magic_set *, const char *, zend_stat_t *); protected int file_pipe2file(struct magic_set *, int, const void *, size_t); -protected int file_vprintf(struct magic_set *, const char *, va_list) - __attribute__((__format__(__printf__, 2, 0))); protected int file_separator(struct magic_set *); protected size_t file_printedlen(const struct magic_set *); protected int file_replace(struct magic_set *, const char *, const char *); -protected int file_printf(struct magic_set *, const char *, ...) - __attribute__((__format__(__printf__, 2, 3))); +protected int file_printf(struct magic_set *, const char *, ...); protected int file_reset(struct magic_set *, int); protected int file_tryelf(struct magic_set *, const struct buffer *); protected int file_trycdf(struct magic_set *, const struct buffer *); -#if HAVE_FORK +#ifdef PHP_FILEINFO_UNCOMPRESS protected int file_zmagic(struct magic_set *, const struct buffer *, const char *); #endif @@ -491,13 +488,9 @@ protected void file_badread(struct magic_set *); protected void file_badseek(struct magic_set *); protected void file_oomem(struct magic_set *, size_t); -protected void file_error(struct magic_set *, int, const char *, ...) - __attribute__((__format__(__printf__, 3, 4))); -protected void file_magerror(struct magic_set *, const char *, ...) - __attribute__((__format__(__printf__, 2, 3))); -protected void file_magwarn(struct magic_set *, const char *, ...) - __attribute__((__format__(__printf__, 2, 3))); -protected void file_mdump(struct magic *); +protected void file_error(struct magic_set *, int, const char *, ...); +protected void file_magerror(struct magic_set *, const char *, ...); +protected void file_magwarn(struct magic_set *, const char *, ...); protected void file_showstr(FILE *, const char *, size_t); protected size_t file_mbswidth(const char *); protected const char *file_getbuffer(struct magic_set *); @@ -513,34 +506,13 @@ size_t); #endif /* __EMX__ */ -protected void buffer_init(struct buffer *, int, const struct stat *, +protected void buffer_init(struct buffer *, int, const zend_stat_t *, const void *, size_t); protected void buffer_fini(struct buffer *); protected int buffer_fill(const struct buffer *); -#include <locale.h> -#if defined(HAVE_XLOCALE_H) -#include <xlocale.h> -#endif - -typedef struct { - const char *pat; -#if defined(HAVE_NEWLOCALE) && defined(HAVE_USELOCALE) && defined(HAVE_FREELOCALE) -#define USE_C_LOCALE - locale_t old_lc_ctype; - locale_t c_lc_ctype; -#else - char *old_lc_ctype; -#endif - int rc; - regex_t rx; -} file_regex_t; - -protected int file_regcomp(file_regex_t *, const char *, int); -protected int file_regexec(file_regex_t *, const char *, size_t, regmatch_t *, - int); -protected void file_regfree(file_regex_t *); -protected void file_regerror(file_regex_t *, int, struct magic_set *); +public void +convert_libmagic_pattern(zval *pattern, char *val, size_t len, uint32_t options); typedef struct { char *buf; @@ -550,28 +522,13 @@ 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; -#endif -#ifndef HAVE_PREAD -ssize_t pread(int, void *, size_t, off_t); -#endif -#ifndef HAVE_VASPRINTF -int vasprintf(char **, const char *, va_list); -#endif -#ifndef HAVE_ASPRINTF -int asprintf(char **, const char *, ...); -#endif -#ifndef HAVE_DPRINTF -int dprintf(int, const char *, ...); -#endif - -#ifndef HAVE_STRLCPY +#ifndef strlcpy size_t strlcpy(char *, const char *, size_t); #endif -#ifndef HAVE_STRLCAT +#ifndef strlcat size_t strlcat(char *, const char *, size_t); #endif #ifndef HAVE_STRCASESTR @@ -587,39 +544,6 @@ #ifndef HAVE_ASCTIME_R char *asctime_r(const struct tm *, char *); #endif -#ifndef HAVE_GMTIME_R -struct tm *gmtime_r(const time_t *, struct tm *); -#endif -#ifndef HAVE_LOCALTIME_R -struct tm *localtime_r(const time_t *, struct tm *); -#endif -#ifndef HAVE_FMTCHECK -const char *fmtcheck(const char *, const char *) - __attribute__((__format_arg__(2))); -#endif - -#ifdef HAVE_LIBSECCOMP -// basic filter -// this mode should not interfere with normal operations -// only some dangerous syscalls are blacklisted -int enable_sandbox_basic(void); - -// enhanced filter -// this mode allows only the necessary syscalls used during normal operation -// extensive testing required !!! -int enable_sandbox_full(void); -#endif - -protected const char *file_getprogname(void); -protected void file_setprogname(const char *); -protected void file_err(int, const char *, ...) - __attribute__((__format__(__printf__, 2, 3), __noreturn__)); -protected void file_errx(int, const char *, ...) - __attribute__((__format__(__printf__, 2, 3), __noreturn__)); -protected void file_warn(const char *, ...) - __attribute__((__format__(__printf__, 1, 2))); -protected void file_warnx(const char *, ...) - __attribute__((__format__(__printf__, 1, 2))); #if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H) && !defined(QUICK) #define QUICK @@ -645,6 +569,18 @@ #else #define FILE_RCSID(id) #endif + +#ifdef PHP_WIN32 +#ifdef _WIN64 +#define FINFO_LSEEK_FUNC _lseeki64 +#else +#define FINFO_LSEEK_FUNC _lseek +#endif +#define FINFO_READ_FUNC _read +#else +#define FINFO_LSEEK_FUNC lseek +#define FINFO_READ_FUNC read +#endif #ifndef __RCSID #define __RCSID(a) #endif diff -u libmagic.orig/fsmagic.c libmagic/fsmagic.c --- libmagic.orig/fsmagic.c 2019-05-07 04:26:48.000000000 +0200 +++ libmagic/fsmagic.c 2020-09-07 00:42:14.447562400 +0200 @@ -66,26 +66,10 @@ # define minor(dev) ((dev) & 0xff) #endif #undef HAVE_MAJOR -#ifdef S_IFLNK -private int -bad_link(struct magic_set *ms, int err, char *buf) -{ - int mime = ms->flags & MAGIC_MIME; - if ((mime & MAGIC_MIME_TYPE) && - file_printf(ms, "inode/symlink") - == -1) - return -1; - else if (!mime) { - if (ms->flags & MAGIC_ERROR) { - file_error(ms, err, - "broken symbolic link to %s", buf); - return -1; - } - if (file_printf(ms, "broken symbolic link to %s", buf) == -1) - return -1; - } - return 1; -} + +#ifdef PHP_WIN32 + +# undef S_IFIFO #endif private int handle_mime(struct magic_set *ms, int mime, const char *str) @@ -103,60 +87,17 @@ } protected int -file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb) +file_fsmagic(struct magic_set *ms, const char *fn, zend_stat_t *sb) { int ret, did = 0; int mime = ms->flags & MAGIC_MIME; int silent = ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION); -#ifdef S_IFLNK - char buf[BUFSIZ+4]; - ssize_t nch; - struct stat tstatbuf; -#endif if (fn == NULL) return 0; #define COMMA (did++ ? ", " : "") - /* - * Fstat is cheaper but fails for files you don't have read perms on. - * On 4.2BSD and similar systems, use lstat() to identify symlinks. - */ -#ifdef S_IFLNK - if ((ms->flags & MAGIC_SYMLINK) == 0) - ret = lstat(fn, sb); - else -#endif - ret = stat(fn, sb); /* don't merge into if; see "ret =" above */ - -#ifdef WIN32 - { - HANDLE hFile = CreateFile((LPCSTR)fn, 0, FILE_SHARE_DELETE | - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, - NULL); - if (hFile != INVALID_HANDLE_VALUE) { - /* - * Stat failed, but we can still open it - assume it's - * a block device, if nothing else. - */ - if (ret) { - sb->st_mode = S_IFBLK; - ret = 0; - } - switch (GetFileType(hFile)) { - case FILE_TYPE_CHAR: - sb->st_mode |= S_IFCHR; - sb->st_mode &= ~S_IFREG; - break; - case FILE_TYPE_PIPE: - sb->st_mode |= S_IFIFO; - sb->st_mode &= ~S_IFREG; - break; - } - CloseHandle(hFile); - } - } -#endif + ret = php_sys_stat(fn, sb); if (ret) { if (ms->flags & MAGIC_ERROR) { @@ -189,32 +130,24 @@ } switch (sb->st_mode & S_IFMT) { - case S_IFDIR: - if (mime) { - if (handle_mime(ms, mime, "directory") == -1) - return -1; - } else if (silent) { - } else if (file_printf(ms, "%sdirectory", COMMA) == -1) - return -1; - break; -#ifdef S_IFCHR - case S_IFCHR: - /* - * If -s has been specified, treat character special files - * like ordinary files. Otherwise, just report that they - * are block special files and go on to the next file. - */ - if ((ms->flags & MAGIC_DEVICES) != 0) { - ret = 0; - break; - } - if (mime) { - if (handle_mime(ms, mime, "chardevice") == -1) - return -1; - } else if (silent) { - } else { -#ifdef HAVE_STRUCT_STAT_ST_RDEV -# ifdef dv_unit +#ifndef PHP_WIN32 +# ifdef S_IFCHR + case S_IFCHR: + /* + * If -s has been specified, treat character special files + * like ordinary files. Otherwise, just report that they + * are block special files and go on to the next file. + */ + if ((ms->flags & MAGIC_DEVICES) != 0) { + ret = 0; + break; + } + if (mime) { + if (handle_mime(ms, mime, "chardevice") == -1) + return -1; + } else { +# ifdef HAVE_STAT_ST_RDEV +# ifdef dv_unit if (file_printf(ms, "%scharacter special (%d/%d/%d)", COMMA, major(sb->st_rdev), dv_unit(sb->st_rdev), dv_subunit(sb->st_rdev)) == -1) @@ -229,45 +162,11 @@ if (file_printf(ms, "%scharacter special", COMMA) == -1) return -1; #endif - } - break; -#endif -#ifdef S_IFBLK - case S_IFBLK: - /* - * If -s has been specified, treat block special files - * like ordinary files. Otherwise, just report that they - * are block special files and go on to the next file. - */ - if ((ms->flags & MAGIC_DEVICES) != 0) { - ret = 0; - break; - } - if (mime) { - if (handle_mime(ms, mime, "blockdevice") == -1) - return -1; - } else if (silent) { - } else { -#ifdef HAVE_STRUCT_STAT_ST_RDEV -# ifdef dv_unit - if (file_printf(ms, "%sblock special (%d/%d/%d)", - COMMA, major(sb->st_rdev), dv_unit(sb->st_rdev), - dv_subunit(sb->st_rdev)) == -1) - return -1; -# else - if (file_printf(ms, "%sblock special (%ld/%ld)", - COMMA, (long)major(sb->st_rdev), - (long)minor(sb->st_rdev)) == -1) - return -1; + } + return 1; # endif -#else - if (file_printf(ms, "%sblock special", COMMA) == -1) - return -1; #endif - } - break; -#endif - /* TODO add code to handle V7 MUX and Blit MUX files */ + #ifdef S_IFIFO case S_IFIFO: if((ms->flags & MAGIC_DEVICES) != 0) @@ -292,92 +191,14 @@ #endif #ifdef S_IFLNK case S_IFLNK: - if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) { + /* stat is used, if it made here then the link is broken */ if (ms->flags & MAGIC_ERROR) { - file_error(ms, errno, "unreadable symlink `%s'", - fn); + file_error(ms, errno, "unreadable symlink `%s'", fn); return -1; } - if (mime) { - if (handle_mime(ms, mime, "symlink") == -1) - return -1; - } else if (silent) { - } else if (file_printf(ms, - "%sunreadable symlink `%s' (%s)", COMMA, fn, - strerror(errno)) == -1) - return -1; - break; - } - buf[nch] = '\0'; /* readlink(2) does not do this */ - - /* If broken symlink, say so and quit early. */ -#ifdef __linux__ - /* - * linux procfs/devfs makes symlinks like pipe:[3515864880] - * that we can't stat their readlink output, so stat the - * original filename instead. - */ - if (stat(fn, &tstatbuf) < 0) - return bad_link(ms, errno, buf); -#else - if (*buf == '/') { - if (stat(buf, &tstatbuf) < 0) - return bad_link(ms, errno, buf); - } else { - char *tmp; - char buf2[BUFSIZ+BUFSIZ+4]; - - if ((tmp = strrchr(fn, '/')) == NULL) { - tmp = buf; /* in current directory anyway */ - } else { - if (tmp - fn + 1 > BUFSIZ) { - if (ms->flags & MAGIC_ERROR) { - file_error(ms, 0, - "path too long: `%s'", buf); - return -1; - } - if (mime) { - if (handle_mime(ms, mime, - "x-path-too-long") == -1) - return -1; - } else if (silent) { - } else if (file_printf(ms, - "%spath too long: `%s'", COMMA, - fn) == -1) - return -1; - break; - } - /* take dir part */ - (void)strlcpy(buf2, fn, sizeof buf2); - buf2[tmp - fn + 1] = '\0'; - /* plus (rel) link */ - (void)strlcat(buf2, buf, sizeof buf2); - tmp = buf2; - } - if (stat(tmp, &tstatbuf) < 0) - return bad_link(ms, errno, buf); - } + return 1; #endif - /* Otherwise, handle it. */ - if ((ms->flags & MAGIC_SYMLINK) != 0) { - const char *p; - ms->flags &= MAGIC_SYMLINK; - p = magic_file(ms, buf); - ms->flags |= MAGIC_SYMLINK; - if (p == NULL) - return -1; - } else { /* just print what it points to */ - if (mime) { - if (handle_mime(ms, mime, "symlink") == -1) - return -1; - } else if (silent) { - } else if (file_printf(ms, "%ssymbolic link to %s", - COMMA, buf) == -1) - return -1; - } - break; -#endif #ifdef S_IFSOCK #ifndef __COHERENT__ case S_IFSOCK: diff -u libmagic.orig/funcs.c libmagic/funcs.c --- libmagic.orig/funcs.c 2019-05-07 04:27:11.000000000 +0200 +++ libmagic/funcs.c 2020-09-07 00:42:14.447562400 +0200 @@ -31,7 +31,6 @@ #endif /* lint */ #include "magic.h" -#include <assert.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -48,70 +47,68 @@ #define SIZE_MAX ((size_t)~0) #endif -/* - * Like printf, only we append to a buffer. - */ -protected int -file_vprintf(struct magic_set *ms, const char *fmt, va_list ap) -{ - int len; - char *buf, *newstr; +#include "php.h" +#include "main/php_network.h" - if (ms->event_flags & EVENT_HAD_ERR) - return 0; - len = vasprintf(&buf, fmt, ap); - if (len < 0) - goto out; - - if (ms->o.buf != NULL) { - len = asprintf(&newstr, "%s%s", ms->o.buf, buf); - free(buf); - if (len < 0) - goto out; - free(ms->o.buf); - buf = newstr; - } - ms->o.buf = buf; - return 0; -out: - fprintf(stderr, "vasprintf failed (%s)", strerror(errno)); - return -1; -} +#ifndef PREG_OFFSET_CAPTURE +# define PREG_OFFSET_CAPTURE (1<<8) +#endif protected int file_printf(struct magic_set *ms, const char *fmt, ...) { - int rv; va_list ap; + char *buf = NULL, *newstr; va_start(ap, fmt); - rv = file_vprintf(ms, fmt, ap); + vspprintf(&buf, 0, fmt, ap); va_end(ap); - return rv; + + if (ms->o.buf != NULL) { + spprintf(&newstr, 0, "%s%s", ms->o.buf, (buf ? buf : "")); + if (buf) { + efree(buf); + } + efree(ms->o.buf); + ms->o.buf = newstr; + } else { + ms->o.buf = buf; + } + return 0; } /* * error - print best error message possible */ /*VARARGS*/ -__attribute__((__format__(__printf__, 3, 0))) private void file_error_core(struct magic_set *ms, int error, const char *f, va_list va, size_t lineno) { + char *buf = NULL; + /* Only the first error is ok */ if (ms->event_flags & EVENT_HAD_ERR) return; if (lineno != 0) { - free(ms->o.buf); + efree(ms->o.buf); ms->o.buf = NULL; - (void)file_printf(ms, "line %" SIZE_T_FORMAT "u:", lineno); + file_printf(ms, "line %" SIZE_T_FORMAT "u:", lineno); } - if (ms->o.buf && *ms->o.buf) - (void)file_printf(ms, " "); - (void)file_vprintf(ms, f, va); - if (error > 0) - (void)file_printf(ms, " (%s)", strerror(error)); + + vspprintf(&buf, 0, f, va); + va_end(va); + + if (error > 0) { + file_printf(ms, "%s (%s)", (*buf ? buf : ""), strerror(error)); + } else if (*buf) { + file_printf(ms, "%s", buf); + } + + if (buf) { + efree(buf); + } + ms->event_flags |= EVENT_HAD_ERR; ms->error = error; } @@ -158,8 +155,6 @@ file_error(ms, errno, "error reading"); } -#ifndef COMPILE_ONLY - protected int file_separator(struct magic_set *ms) { @@ -207,8 +202,8 @@ */ /*ARGSUSED*/ protected int -file_buffer(struct magic_set *ms, int fd, struct stat *st, - const char *inname __attribute__ ((__unused__)), +file_buffer(struct magic_set *ms, php_stream *stream, zend_stat_t *st, + const char *inname, const void *buf, size_t nb) { int m = 0, rv = 0, looks_text = 0; @@ -218,6 +213,19 @@ const char *ftype = NULL; char *rbuf = NULL; struct buffer b; + int fd = -1; + + if (stream) { +#ifdef _WIN64 + php_socket_t _fd = fd; +#else + int _fd; +#endif + int _ret = php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)&_fd, 0); + if (SUCCESS == _ret) { + fd = (int)_fd; + } + } buffer_init(&b, fd, st, buf, nb); ms->mode = b.st.st_mode; @@ -250,8 +258,8 @@ } } #endif -#if HAVE_FORK - /* try compression stuff */ + +#if PHP_FILEINFO_UNCOMPRESS if ((ms->flags & MAGIC_NO_CHECK_COMPRESS) == 0) { m = file_zmagic(ms, &b, inname); if ((ms->flags & MAGIC_DEBUG) != 0) @@ -363,17 +371,16 @@ if (file_printf(ms, "%s", code_mime) == -1) rv = -1; } -#if HAVE_FORK +#if PHP_FILEINFO_UNCOMPRESS done_encoding: #endif - free(rbuf); + efree(rbuf); buffer_fini(&b); if (rv) return rv; return m; } -#endif protected int file_reset(struct magic_set *ms, int checkloaded) @@ -383,11 +390,11 @@ return -1; } if (ms->o.buf) { - free(ms->o.buf); + efree(ms->o.buf); ms->o.buf = NULL; } if (ms->o.pbuf) { - free(ms->o.pbuf); + efree(ms->o.pbuf); ms->o.pbuf = NULL; } ms->event_flags &= ~EVENT_HAD_ERR; @@ -425,7 +432,7 @@ return NULL; } psize = len * 4 + 1; - if ((pbuf = CAST(char *, realloc(ms->o.pbuf, psize))) == NULL) { + if ((pbuf = CAST(char *, erealloc(ms->o.pbuf, psize))) == NULL) { file_oomem(ms, psize); return NULL; } @@ -489,8 +496,8 @@ if (level >= ms->c.len) { len = (ms->c.len = 20 + level) * sizeof(*ms->c.li); ms->c.li = CAST(struct level_info *, (ms->c.li == NULL) ? - malloc(len) : - realloc(ms->c.li, len)); + emalloc(len) : + erealloc(ms->c.li, len)); if (ms->c.li == NULL) { file_oomem(ms, len); return -1; @@ -513,76 +520,38 @@ protected int file_replace(struct magic_set *ms, const char *pat, const char *rep) { - file_regex_t rx; - int rc, rv = -1; - - rc = file_regcomp(&rx, pat, REG_EXTENDED); - if (rc) { - file_regerror(&rx, rc, ms); - } else { - regmatch_t rm; - int nm = 0; - while (file_regexec(&rx, ms->o.buf, 1, &rm, 0) == 0) { - ms->o.buf[rm.rm_so] = '\0'; - if (file_printf(ms, "%s%s", rep, - rm.rm_eo != 0 ? ms->o.buf + rm.rm_eo : "") == -1) - goto out; - nm++; - } - rv = nm; + zval patt; + uint32_t opts = 0; + pcre_cache_entry *pce; + zend_string *res; + zend_string *repl; + size_t rep_cnt = 0; + + opts |= PCRE2_MULTILINE; + convert_libmagic_pattern(&patt, (char*)pat, strlen(pat), opts); + if ((pce = pcre_get_compiled_regex_cache_ex(Z_STR(patt), 0)) == NULL) { + zval_ptr_dtor(&patt); + rep_cnt = -1; + goto out; } -out: - file_regfree(&rx); - return rv; -} - -protected int -file_regcomp(file_regex_t *rx, const char *pat, int flags) -{ -#ifdef USE_C_LOCALE - rx->c_lc_ctype = newlocale(LC_CTYPE_MASK, "C", 0); - assert(rx->c_lc_ctype != NULL); - rx->old_lc_ctype = uselocale(rx->c_lc_ctype); - assert(rx->old_lc_ctype != NULL); -#else - rx->old_lc_ctype = setlocale(LC_CTYPE, "C"); -#endif - rx->pat = pat; + zval_ptr_dtor(&patt); - return rx->rc = regcomp(&rx->rx, pat, flags); -} + repl = zend_string_init(rep, strlen(rep), 0); + res = php_pcre_replace_impl(pce, NULL, ms->o.buf, strlen(ms->o.buf), repl, -1, &rep_cnt); -protected int -file_regexec(file_regex_t *rx, const char *str, size_t nmatch, - regmatch_t* pmatch, int eflags) -{ - assert(rx->rc == 0); - /* XXX: force initialization because glibc does not always do this */ - memset(pmatch, 0, nmatch * sizeof(*pmatch)); - return regexec(&rx->rx, str, nmatch, pmatch, eflags); -} + zend_string_release_ex(repl, 0); + if (NULL == res) { + rep_cnt = -1; + goto out; + } -protected void -file_regfree(file_regex_t *rx) -{ - if (rx->rc == 0) - regfree(&rx->rx); -#ifdef USE_C_LOCALE - (void)uselocale(rx->old_lc_ctype); - freelocale(rx->c_lc_ctype); -#else - (void)setlocale(LC_CTYPE, rx->old_lc_ctype); -#endif -} + strncpy(ms->o.buf, ZSTR_VAL(res), ZSTR_LEN(res)); + ms->o.buf[ZSTR_LEN(res)] = '\0'; -protected void -file_regerror(file_regex_t *rx, int rc, struct magic_set *ms) -{ - char errmsg[512]; + zend_string_release_ex(res, 0); - (void)regerror(rc, &rx->rx, errmsg, sizeof(errmsg)); - file_magerror(ms, "regex error %d for `%s', (%s)", rc, rx->pat, - errmsg); +out: + return rep_cnt; } protected file_pushbuf_t * @@ -593,7 +562,7 @@ if (ms->event_flags & EVENT_HAD_ERR) return NULL; - if ((pb = (CAST(file_pushbuf_t *, malloc(sizeof(*pb))))) == NULL) + if ((pb = (CAST(file_pushbuf_t *, emalloc(sizeof(*pb))))) == NULL) return NULL; pb->buf = ms->o.buf; @@ -611,8 +580,8 @@ char *rbuf; if (ms->event_flags & EVENT_HAD_ERR) { - free(pb->buf); - free(pb); + efree(pb->buf); + efree(pb); return NULL; } @@ -621,7 +590,7 @@ ms->o.buf = pb->buf; ms->offset = pb->offset; - free(pb); + efree(pb); return rbuf; } diff -u libmagic.orig/magic.c libmagic/magic.c --- libmagic.orig/magic.c 2019-05-07 04:27:11.000000000 +0200 +++ libmagic/magic.c 2020-09-07 00:42:14.447562400 +0200 @@ -25,11 +25,6 @@ * SUCH DAMAGE. */ -#ifdef WIN32 -#include <windows.h> -#include <shlwapi.h> -#endif - #include "file.h" #ifndef lint @@ -39,10 +34,16 @@ #include "magic.h" #include <stdlib.h> +#ifdef PHP_WIN32 +#include "win32/unistd.h" +#else #include <unistd.h> +#endif #include <string.h> -#ifdef QUICK -#include <sys/mman.h> +#include "config.h" + +#ifdef PHP_WIN32 +#include <shlwapi.h> #endif #include <limits.h> /* for PIPE_BUF */ @@ -69,194 +70,21 @@ #endif #endif -private void close_and_restore(const struct magic_set *, const char *, int, - const struct stat *); +#ifdef PHP_WIN32 +# undef S_IFLNK +# undef S_IFIFO +#endif + private int unreadable_info(struct magic_set *, mode_t, const char *); +#if 0 private const char* get_default_magic(void); -#ifndef COMPILE_ONLY -private const char *file_or_fd(struct magic_set *, const char *, int); #endif +private const char *file_or_stream(struct magic_set *, const char *, php_stream *); #ifndef STDIN_FILENO #define STDIN_FILENO 0 #endif -#ifdef WIN32 -/* HINSTANCE of this shared library. Needed for get_default_magic() */ -static HINSTANCE _w32_dll_instance = NULL; - -static void -_w32_append_path(char **hmagicpath, const char *fmt, ...) -{ - char *tmppath; - char *newpath; - va_list ap; - - va_start(ap, fmt); - if (vasprintf(&tmppath, fmt, ap) < 0) { - va_end(ap); - return; - } - va_end(ap); - - if (access(tmppath, R_OK) == -1) - goto out; - - if (*hmagicpath == NULL) { - *hmagicpath = tmppath; - return; - } - - if (asprintf(&newpath, "%s%c%s", *hmagicpath, PATHSEP, tmppath) < 0) - goto out; - - free(*hmagicpath); - free(tmppath); - *hmagicpath = newpath; - return; -out: - free(tmppath); -} - -static void -_w32_get_magic_relative_to(char **hmagicpath, HINSTANCE module) -{ - static const char *trypaths[] = { - "%s/share/misc/magic.mgc", - "%s/magic.mgc", - }; - LPSTR dllpath; - size_t sp; - - dllpath = calloc(MAX_PATH + 1, sizeof(*dllpath)); - - if (!GetModuleFileNameA(module, dllpath, MAX_PATH)) - goto out; - - PathRemoveFileSpecA(dllpath); - - if (module) { - char exepath[MAX_PATH]; - GetModuleFileNameA(NULL, exepath, MAX_PATH); - PathRemoveFileSpecA(exepath); - if (stricmp(exepath, dllpath) == 0) - goto out; - } - - sp = strlen(dllpath); - if (sp > 3 && stricmp(&dllpath[sp - 3], "bin") == 0) { - _w32_append_path(hmagicpath, - "%s/../share/misc/magic.mgc", dllpath); - goto out; - } - - for (sp = 0; sp < __arraycount(trypaths); sp++) - _w32_append_path(hmagicpath, trypaths[sp], dllpath); -out: - free(dllpath); -} - -/* Placate GCC by offering a sacrificial previous prototype */ -BOOL WINAPI DllMain(HINSTANCE, DWORD, LPVOID); - -BOOL WINAPI -DllMain(HINSTANCE hinstDLL, DWORD fdwReason, - LPVOID lpvReserved __attribute__((__unused__))) -{ - if (fdwReason == DLL_PROCESS_ATTACH) - _w32_dll_instance = hinstDLL; - return 1; -} -#endif - -private const char * -get_default_magic(void) -{ - static const char hmagic[] = "/.magic/magic.mgc"; - static char *default_magic; - char *home, *hmagicpath; - -#ifndef WIN32 - struct stat st; - - if (default_magic) { - free(default_magic); - default_magic = NULL; - } - if ((home = getenv("HOME")) == NULL) - return MAGIC; - - if (asprintf(&hmagicpath, "%s/.magic.mgc", home) < 0) - return MAGIC; - if (stat(hmagicpath, &st) == -1) { - free(hmagicpath); - if (asprintf(&hmagicpath, "%s/.magic", home) < 0) - return MAGIC; - if (stat(hmagicpath, &st) == -1) - goto out; - if (S_ISDIR(st.st_mode)) { - free(hmagicpath); - if (asprintf(&hmagicpath, "%s/%s", home, hmagic) < 0) - return MAGIC; - if (access(hmagicpath, R_OK) == -1) - goto out; - } - } - - if (asprintf(&default_magic, "%s:%s", hmagicpath, MAGIC) < 0) - goto out; - free(hmagicpath); - return default_magic; -out: - default_magic = NULL; - free(hmagicpath); - return MAGIC; -#else - hmagicpath = NULL; - - if (default_magic) { - free(default_magic); - default_magic = NULL; - } - - /* First, try to get a magic file from user-application data */ - if ((home = getenv("LOCALAPPDATA")) != NULL) - _w32_append_path(&hmagicpath, "%s%s", home, hmagic); - - /* Second, try to get a magic file from the user profile data */ - if ((home = getenv("USERPROFILE")) != NULL) - _w32_append_path(&hmagicpath, - "%s/Local Settings/Application Data%s", home, hmagic); - - /* Third, try to get a magic file from Common Files */ - if ((home = getenv("COMMONPROGRAMFILES")) != NULL) - _w32_append_path(&hmagicpath, "%s%s", home, hmagic); - - /* Fourth, try to get magic file relative to exe location */ - _w32_get_magic_relative_to(&hmagicpath, NULL); - - /* Fifth, try to get magic file relative to dll location */ - _w32_get_magic_relative_to(&hmagicpath, _w32_dll_instance); - - /* Avoid MAGIC constant - it likely points to a file within MSys tree */ - default_magic = hmagicpath; - return default_magic; -#endif -} - -public const char * -magic_getpath(const char *magicfile, int action) -{ - if (magicfile != NULL) - return magicfile; - - magicfile = getenv("MAGIC"); - if (magicfile != NULL) - return magicfile; - - return action == FILE_LOAD ? get_default_magic() : MAGIC; -} - public struct magic_set * magic_open(int flags) { @@ -302,21 +130,6 @@ return file_apprentice(ms, magicfile, FILE_LOAD); } -#ifndef COMPILE_ONLY -/* - * Install a set of compiled magic buffers. - */ -public int -magic_load_buffers(struct magic_set *ms, void **bufs, size_t *sizes, - size_t nbufs) -{ - if (ms == NULL) - return -1; - return buffer_apprentice(ms, RCAST(struct magic **, bufs), - sizes, nbufs); -} -#endif - public int magic_compile(struct magic_set *ms, const char *magicfile) { @@ -341,9 +154,10 @@ return file_apprentice(ms, magicfile, FILE_LIST); } +#if 0 private void close_and_restore(const struct magic_set *ms, const char *name, int fd, - const struct stat *sb) + const zend_stat_t *sb) { if (fd == STDIN_FILENO || name == NULL) return; @@ -373,8 +187,8 @@ #endif } } +#endif -#ifndef COMPILE_ONLY /* * find type of descriptor @@ -384,7 +198,7 @@ { if (ms == NULL) return NULL; - return file_or_fd(ms, NULL, fd); + return file_or_stream(ms, NULL, NULL); } /* @@ -395,19 +209,25 @@ { if (ms == NULL) return NULL; - return file_or_fd(ms, inname, STDIN_FILENO); + return file_or_stream(ms, inname, NULL); +} + +public const char * +magic_stream(struct magic_set *ms, php_stream *stream) +{ + if (ms == NULL) + return NULL; + return file_or_stream(ms, NULL, stream); } private const char * -file_or_fd(struct magic_set *ms, const char *inname, int fd) +file_or_stream(struct magic_set *ms, const char *inname, php_stream *stream) { int rv = -1; unsigned char *buf; - struct stat sb; + zend_stat_t sb; ssize_t nbytes = 0; /* number of bytes read from a datafile */ - int ispipe = 0; - int okstat = 0; - off_t pos = CAST(off_t, -1); + int no_in_stream = 0; if (file_reset(ms, 1) == -1) goto out; @@ -417,7 +237,7 @@ * some overlapping space for matches near EOF */ #define SLOP (1 + sizeof(union VALUETYPE)) - if ((buf = CAST(unsigned char *, malloc(ms->bytes_max + SLOP))) == NULL) + if ((buf = CAST(unsigned char *, emalloc(ms->bytes_max + SLOP))) == NULL) return NULL; switch (file_fsmagic(ms, inname, &sb)) { @@ -430,96 +250,46 @@ goto done; } -#ifdef WIN32 - /* Place stdin in binary mode, so EOF (Ctrl+Z) doesn't stop early. */ - if (fd == STDIN_FILENO) - _setmode(STDIN_FILENO, O_BINARY); -#endif - if (inname != NULL) { - int flags = O_RDONLY|O_BINARY|O_NONBLOCK; - errno = 0; - if ((fd = open(inname, flags)) < 0) { - okstat = stat(inname, &sb) == 0; - if (okstat && S_ISFIFO(sb.st_mode)) - ispipe = 1; -#ifdef WIN32 - /* - * Can't stat, can't open. It may have been opened in - * fsmagic, so if the user doesn't have read permission, - * allow it to say so; otherwise an error was probably - * displayed in fsmagic. - */ - if (!okstat && errno == EACCES) { - sb.st_mode = S_IFBLK; - okstat = 1; - } -#endif - if (okstat && - unreadable_info(ms, sb.st_mode, inname) == -1) + errno = 0; + + if (inname && !stream) { + no_in_stream = 1; + stream = php_stream_open_wrapper((char *)inname, "rb", REPORT_ERRORS, NULL); + if (!stream) { + if (unreadable_info(ms, sb.st_mode, inname) == -1) goto done; - rv = 0; + rv = -1; goto done; } } - if (fd != -1) { - if (!okstat) - okstat = fstat(fd, &sb) == 0; - if (okstat && S_ISFIFO(sb.st_mode)) - ispipe = 1; - if (inname == NULL) - pos = lseek(fd, CAST(off_t, 0), SEEK_CUR); + php_stream_statbuf ssb; + if (php_stream_stat(stream, &ssb) < 0) { + if (ms->flags & MAGIC_ERROR) { + file_error(ms, errno, "cannot stat `%s'", inname); + rv = -1; + goto done; + } } + memcpy(&sb, &ssb.sb, sizeof(zend_stat_t)); /* * try looking at the first ms->bytes_max bytes */ - if (ispipe) { - if (fd != -1) { - ssize_t r = 0; - - while ((r = sread(fd, RCAST(void *, &buf[nbytes]), - CAST(size_t, ms->bytes_max - nbytes), 1)) > 0) { - nbytes += r; - if (r < PIPE_BUF) break; - } - } - - if (nbytes == 0 && inname) { - /* We can not read it, but we were able to stat it. */ - if (unreadable_info(ms, sb.st_mode, inname) == -1) - goto done; - rv = 0; - goto done; - } - - } else if (fd != -1) { - /* Windows refuses to read from a big console buffer. */ - size_t howmany = -#if defined(WIN32) - _isatty(fd) ? 8 * 1024 : -#endif - ms->bytes_max; - if ((nbytes = read(fd, RCAST(void *, buf), howmany)) == -1) { - if (inname == NULL && fd != STDIN_FILENO) - file_error(ms, errno, "cannot read fd %d", fd); - else - file_error(ms, errno, "cannot read `%s'", - inname == NULL ? "/dev/stdin" : inname); - goto done; - } + if ((nbytes = php_stream_read(stream, (char *)buf, ms->bytes_max - nbytes)) < 0) { + file_error(ms, errno, "cannot read `%s'", inname); + goto done; } (void)memset(buf + nbytes, 0, SLOP); /* NUL terminate */ - if (file_buffer(ms, fd, okstat ? &sb : NULL, inname, buf, CAST(size_t, nbytes)) == -1) + if (file_buffer(ms, stream, &sb, inname, buf, CAST(size_t, nbytes)) == -1) goto done; rv = 0; done: - free(buf); - if (fd != -1) { - if (pos != CAST(off_t, -1)) - (void)lseek(fd, pos, SEEK_SET); - close_and_restore(ms, inname, fd, &sb); + efree(buf); + + if (no_in_stream && stream) { + php_stream_close(stream); } out: return rv == 0 ? file_getbuffer(ms) : NULL; @@ -537,12 +307,11 @@ * The main work is done here! * We have the file name and/or the data buffer to be identified. */ - if (file_buffer(ms, -1, NULL, NULL, buf, nb) == -1) { + if (file_buffer(ms, NULL, NULL, NULL, buf, nb) == -1) { return NULL; } return file_getbuffer(ms); } -#endif public const char * magic_error(struct magic_set *ms) diff -u libmagic.orig/magic.h libmagic/magic.h --- libmagic.orig/magic.h 2020-11-23 17:12:12.776465800 +0100 +++ libmagic/magic.h 2020-09-07 00:42:14.447562400 +0200 @@ -124,6 +124,7 @@ const char *magic_getpath(const char *, int); const char *magic_file(magic_t, const char *); +const char *magic_stream(magic_t, php_stream *); const char *magic_descriptor(magic_t, int); const char *magic_buffer(magic_t, const void *, size_t); diff -u libmagic.orig/print.c libmagic/print.c --- libmagic.orig/print.c 2019-03-12 21:43:05.000000000 +0100 +++ libmagic/print.c 2020-09-07 00:42:14.447562400 +0200 @@ -28,6 +28,7 @@ /* * print.c - debugging printout routines */ +#include "php.h" #include "file.h" @@ -43,6 +44,8 @@ #endif #include <time.h> +#define SZOF(a) (sizeof(a) / sizeof(a[0])) + #include "cdf.h" #ifndef COMPILE_ONLY @@ -73,7 +76,7 @@ if (m->mask_op & FILE_OPINVERSE) (void) fputc('~', stderr); - if (IS_STRING(m->type)) { + if (IS_LIBMAGIC_STRING(m->type)) { if (m->str_flags) { (void) fputc('/', stderr); if (m->str_flags & STRING_COMPACT_WHITESPACE) @@ -215,18 +218,18 @@ file_magwarn(struct magic_set *ms, const char *f, ...) { va_list va; + char *expanded_format = NULL; + int expanded_len; - /* cuz we use stdout for most, stderr here */ - (void) fflush(stdout); - - if (ms->file) - (void) fprintf(stderr, "%s, %lu: ", ms->file, - CAST(unsigned long, ms->line)); - (void) fprintf(stderr, "Warning: "); va_start(va, f); - (void) vfprintf(stderr, f, va); + expanded_len = vasprintf(&expanded_format, f, va); va_end(va); - (void) fputc('\n', stderr); + + if (expanded_len >= 0 && expanded_format) { + php_error_docref(NULL, E_NOTICE, "Warning: %s", expanded_format); + + free(expanded_format); + } } protected const char * @@ -247,13 +250,13 @@ } if (flags & FILE_T_LOCAL) { - tm = localtime_r(&t, &tmz); + tm = php_localtime_r(&t, &tmz); } else { - tm = gmtime_r(&t, &tmz); + tm = php_gmtime_r(&t, &tmz); } if (tm == NULL) goto out; - pp = asctime_r(tm, buf); + pp = php_asctime_r(tm, buf); if (pp == NULL) goto out; diff -u libmagic.orig/readcdf.c libmagic/readcdf.c --- libmagic.orig/readcdf.c 2019-03-12 21:43:05.000000000 +0100 +++ libmagic/readcdf.c 2020-09-07 00:42:14.463191200 +0200 @@ -31,7 +31,11 @@ #include <assert.h> #include <stdlib.h> +#ifdef PHP_WIN32 +#include "win32/unistd.h" +#else #include <unistd.h> +#endif #include <string.h> #include <time.h> #include <ctype.h> @@ -100,10 +104,6 @@ if (clsid[0] == cv[i].clsid[0] && clsid[1] == cv[i].clsid[1]) return cv[i].mime; } -#ifdef CDF_DEBUG - fprintf(stderr, "unknown mime %" PRIx64 ", %" PRIx64 "\n", clsid[0], - clsid[1]); -#endif return NULL; } @@ -112,30 +112,24 @@ { size_t i; const char *rv = NULL; -#ifdef USE_C_LOCALE - locale_t old_lc_ctype, c_lc_ctype; + char *vbuf_lower; - c_lc_ctype = newlocale(LC_CTYPE_MASK, "C", 0); - assert(c_lc_ctype != NULL); - old_lc_ctype = uselocale(c_lc_ctype); - assert(old_lc_ctype != NULL); -#else - char *old_lc_ctype = setlocale(LC_CTYPE, "C"); -#endif - for (i = 0; nv[i].pattern != NULL; i++) - if (strcasestr(vbuf, nv[i].pattern) != NULL) { + vbuf_lower = zend_str_tolower_dup(vbuf, strlen(vbuf)); + for (i = 0; nv[i].pattern != NULL; i++) { + char *pattern_lower; + int found; + + pattern_lower = zend_str_tolower_dup(nv[i].pattern, strlen(nv[i].pattern)); + found = (strstr(vbuf_lower, pattern_lower) != NULL); + efree(pattern_lower); + + if (found) { rv = nv[i].mime; break; } -#ifdef CDF_DEBUG - fprintf(stderr, "unknown app %s\n", vbuf); -#endif -#ifdef USE_C_LOCALE - (void)uselocale(old_lc_ctype); - freelocale(c_lc_ctype); -#else - setlocale(LC_CTYPE, old_lc_ctype); -#endif + } + + efree(vbuf_lower); return rv; } @@ -151,7 +145,9 @@ const char *s, *e; int len; - if (!NOTMIME(ms) && root_storage) + memset(&ts, 0, sizeof(ts)); + + if (!NOTMIME(ms) && root_storage) str = cdf_clsid_to_mime(root_storage->d_storage_uuid, clsid2mime); @@ -277,10 +273,10 @@ if (file_printf(ms, "%s%s", cdf_u16tos8(buf, ce[i].ce_namlen, ce[i].ce_name), i == cat->cat_num - 1 ? "]" : ", ") == -1) { - free(cat); + efree(cat); return -1; } - free(cat); + efree(cat); } else if (ms->flags & MAGIC_MIME_TYPE) { if (file_printf(ms, "application/CDFV2") == -1) return -1; @@ -341,7 +337,7 @@ } m = cdf_file_property_info(ms, info, count, root_storage); - free(info); + efree(info); return m == -1 ? -2 : m; } @@ -651,11 +647,11 @@ cdf_zero_stream(&scn); cdf_zero_stream(&sst); out3: - free(dir.dir_tab); + efree(dir.dir_tab); out2: - free(ssat.sat_tab); + efree(ssat.sat_tab); out1: - free(sat.sat_tab); + efree(sat.sat_tab); out0: /* If we handled it already, return */ if (i != -1) diff -u libmagic.orig/softmagic.c libmagic/softmagic.c --- libmagic.orig/softmagic.c 2019-05-17 04:24:59.000000000 +0200 +++ libmagic/softmagic.c 2020-09-07 00:42:14.463191200 +0200 @@ -43,6 +43,10 @@ #include <time.h> #include "der.h" +#ifndef PREG_OFFSET_CAPTURE +# define PREG_OFFSET_CAPTURE (1<<8) +#endif + private int match(struct magic_set *, struct magic *, uint32_t, const struct buffer *, size_t, int, int, int, uint16_t *, uint16_t *, int *, int *, int *, int *); @@ -139,8 +143,8 @@ return 0; } -#define FILE_FMTDEBUG -#ifdef FILE_FMTDEBUG + +#if defined(FILE_FMTDEBUG) && defined(HAVE_FMTCHECK) #define F(a, b, c) file_fmtcheck((a), (b), (c), __FILE__, __LINE__) private const char * __attribute__((__format_arg__(3))) @@ -159,8 +163,10 @@ " with `%s'", file, line, desc, def); return ptr; } -#else +#elif defined(HAVE_FMTCHECK) #define F(a, b, c) fmtcheck((b), (c)) +#else +#define F(a, b, c) ((b)) #endif /* @@ -222,7 +228,7 @@ struct magic *m = &magic[magindex]; if (m->type != FILE_NAME) - if ((IS_STRING(m->type) && + if ((IS_LIBMAGIC_STRING(m->type) && #define FLT (STRING_BINTEST | STRING_TEXTTEST) ((text && (m->str_flags & FLT) == STRING_BINTEST) || (!text && (m->str_flags & FLT) == STRING_TEXTTEST))) || @@ -463,45 +469,28 @@ private int check_fmt(struct magic_set *ms, const char *fmt) { - file_regex_t rx; - int rc, rv = -1; + pcre_cache_entry *pce; + int rv = -1; + zend_string *pattern; if (strchr(fmt, '%') == NULL) return 0; - rc = file_regcomp(&rx, "%[-0-9\\.]*s", REG_EXTENDED|REG_NOSUB); - if (rc) { - file_regerror(&rx, rc, ms); + pattern = zend_string_init("~%[-0-9\\.]*s~", sizeof("~%[-0-9\\.]*s~") - 1, 0); + if ((pce = pcre_get_compiled_regex_cache_ex(pattern, 0)) == NULL) { + rv = -1; } else { - rc = file_regexec(&rx, fmt, 0, 0, 0); - rv = !rc; + pcre2_code *re = php_pcre_pce_re(pce); + pcre2_match_data *match_data = php_pcre_create_match_data(0, re); + if (match_data) { + rv = pcre2_match(re, (PCRE2_SPTR)fmt, strlen(fmt), 0, 0, match_data, php_pcre_mctx()) > 0; + php_pcre_free_match_data(match_data); + } } - file_regfree(&rx); + zend_string_release(pattern); return rv; } -#if !defined(HAVE_STRNDUP) || defined(__aiws__) -# ifdef __aiws__ -# define strndup aix_strndup /* aix is broken */ -# endif -char *strndup(const char *, size_t); - -char * -strndup(const char *str, size_t n) -{ - size_t len; - char *copy; - - for (len = 0; len < n && str[len]; len++) - continue; - if ((copy = malloc(len + 1)) == NULL) - return NULL; - (void)memcpy(copy, str, len); - copy[len] = '\0'; - return copy; -} -#endif /* HAVE_STRNDUP */ - static int varexpand(struct magic_set *ms, char *buf, size_t len, const char *str) { @@ -796,15 +785,11 @@ char *cp; int rval; - cp = strndup(RCAST(const char *, ms->search.s), + cp = estrndup(RCAST(const char *, ms->search.s), ms->search.rm_len); - if (cp == NULL) { - file_oomem(ms, ms->search.rm_len); - return -1; - } rval = file_printf(ms, F(ms, desc, "%s"), - file_printable(sbuf, sizeof(sbuf), cp, ms->search.rm_len)); - free(cp); + file_printable(sbuf, sizeof(sbuf), cp, ms->search.rm_len)); + efree(cp); if (rval == -1) return -1; @@ -1555,9 +1540,6 @@ *indir_count, *name_count); mdebug(offset, RCAST(char *, RCAST(void *, p)), sizeof(union VALUETYPE)); -#ifndef COMPILE_ONLY - file_mdump(m); -#endif } if (m->flag & INDIR) { @@ -1685,7 +1667,7 @@ offset = do_ops(m, SEXT(sgn,64,BE64(p)), off); break; default: - abort(); + break; } if (m->flag & INDIROFFADD) { @@ -1706,9 +1688,6 @@ if ((ms->flags & MAGIC_DEBUG) != 0) { mdebug(offset, RCAST(char *, RCAST(void *, p)), sizeof(union VALUETYPE)); -#ifndef COMPILE_ONLY - file_mdump(m); -#endif } } @@ -1792,17 +1771,16 @@ if (rv == 1) { if ((ms->flags & MAGIC_NODESC) == 0 && - file_printf(ms, F(ms, m->desc, "%u"), offset) == -1) - { - free(rbuf); + file_printf(ms, F(ms, m->desc, "%u"), offset) == -1) { + if (rbuf) efree(rbuf); return -1; } if (file_printf(ms, "%s", rbuf) == -1) { - free(rbuf); + if (rbuf) efree(rbuf); return -1; } } - free(rbuf); + if (rbuf) efree(rbuf); return rv; case FILE_USE: @@ -1926,6 +1904,61 @@ return file_strncmp(a, b, len, flags); } +public void +convert_libmagic_pattern(zval *pattern, char *val, size_t len, uint32_t options) +{ + int i, j; + zend_string *t; + + for (i = j = 0; i < len; i++) { + switch (val[i]) { + case '~': + j += 2; + break; + case '\0': + j += 4; + break; + default: + j++; + break; + } + } + t = zend_string_alloc(j + 4, 0); + + j = 0; + ZSTR_VAL(t)[j++] = '~'; + + for (i = 0; i < len; i++, j++) { + switch (val[i]) { + case '~': + ZSTR_VAL(t)[j++] = '\\'; + ZSTR_VAL(t)[j] = '~'; + break; + case '\0': + ZSTR_VAL(t)[j++] = '\\'; + ZSTR_VAL(t)[j++] = 'x'; + ZSTR_VAL(t)[j++] = '0'; + ZSTR_VAL(t)[j] = '0'; + break; + default: + ZSTR_VAL(t)[j] = val[i]; + break; + } + } + ZSTR_VAL(t)[j++] = '~'; + + if (options & PCRE2_CASELESS) + ZSTR_VAL(t)[j++] = 'i'; + + if (options & PCRE2_MULTILINE) + ZSTR_VAL(t)[j++] = 'm'; + + ZSTR_VAL(t)[j]='\0'; + ZSTR_LEN(t) = j; + + ZVAL_NEW_STR(pattern, t); +} + private int magiccheck(struct magic_set *ms, struct magic *m) { @@ -2104,65 +2137,77 @@ break; } case FILE_REGEX: { - int rc; - file_regex_t rx; - const char *search; + zval pattern; + uint32_t options = 0; + pcre_cache_entry *pce; - if (ms->search.s == NULL) - return 0; + options |= PCRE2_MULTILINE; - l = 0; - rc = file_regcomp(&rx, m->value.s, - REG_EXTENDED|REG_NEWLINE| - ((m->str_flags & STRING_IGNORE_CASE) ? REG_ICASE : 0)); - if (rc) { - file_regerror(&rx, rc, ms); - v = CAST(uint64_t, -1); + if (m->str_flags & STRING_IGNORE_CASE) { + options |= PCRE2_CASELESS; + } + + convert_libmagic_pattern(&pattern, (char *)m->value.s, m->vallen, options); + + l = v = 0; + if ((pce = pcre_get_compiled_regex_cache(Z_STR(pattern))) == NULL) { + zval_ptr_dtor(&pattern); + return -1; } else { - regmatch_t pmatch; - size_t slen = ms->search.s_len; - char *copy; - if (slen != 0) { - copy = CAST(char *, malloc(slen)); - if (copy == NULL) { - file_regfree(&rx); - file_error(ms, errno, - "can't allocate %" SIZE_T_FORMAT "u bytes", - slen); - return -1; - } - memcpy(copy, ms->search.s, slen); - copy[--slen] = '\0'; - search = copy; + /* pce now contains the compiled regex */ + zval retval; + zval subpats; + zend_string *haystack; + + ZVAL_NULL(&retval); + ZVAL_NULL(&subpats); + + /* Cut the search len from haystack, equals to REG_STARTEND */ + haystack = zend_string_init(ms->search.s, ms->search.s_len, 0); + + /* match v = 0, no match v = 1 */ + php_pcre_match_impl(pce, haystack, &retval, &subpats, 0, 1, PREG_OFFSET_CAPTURE, 0); + /* Free haystack */ + zend_string_release(haystack); + + if (Z_LVAL(retval) < 0) { + zval_ptr_dtor(&subpats); + zval_ptr_dtor(&pattern); + return -1; + } else if ((Z_LVAL(retval) > 0) && (Z_TYPE(subpats) == IS_ARRAY)) { + /* Need to fetch global match which equals pmatch[0] */ + zval *pzval; + HashTable *ht = Z_ARRVAL(subpats); + if ((pzval = zend_hash_index_find(ht, 0)) != NULL && Z_TYPE_P(pzval) == IS_ARRAY) { + /* If everything goes according to the master plan + tmpcopy now contains two elements: + 0 = the match + 1 = starting position of the match */ + zval *match, *offset; + if ((match = zend_hash_index_find(Z_ARRVAL_P(pzval), 0)) && + (offset = zend_hash_index_find(Z_ARRVAL_P(pzval), 1))) { + if (Z_TYPE_P(match) != IS_STRING && Z_TYPE_P(offset) != IS_LONG) { + goto error_out; + } + ms->search.s += Z_LVAL_P(offset); /* this is where the match starts */ + ms->search.offset += Z_LVAL_P(offset); /* this is where the match starts as size_t */ + ms->search.rm_len = Z_STRLEN_P(match) /* This is the length of the matched pattern */; + v = 0; + } else { + goto error_out; + } + } else { +error_out: + zval_ptr_dtor(&subpats); + zval_ptr_dtor(&pattern); + return -1; + } } else { - search = CCAST(char *, ""); - copy = NULL; - } - rc = file_regexec(&rx, RCAST(const char *, search), - 1, &pmatch, 0); - free(copy); - switch (rc) { - case 0: - ms->search.s += CAST(int, pmatch.rm_so); - ms->search.offset += CAST(size_t, pmatch.rm_so); - ms->search.rm_len = CAST(size_t, - pmatch.rm_eo - pmatch.rm_so); - v = 0; - break; - - case REG_NOMATCH: v = 1; - break; - - default: - file_regerror(&rx, rc, ms); - v = CAST(uint64_t, -1); - break; } + zval_ptr_dtor(&subpats); + zval_ptr_dtor(&pattern); } - file_regfree(&rx); - if (v == CAST(uint64_t, -1)) - return -1; break; } case FILE_INDIRECT: diff -u libmagic.orig/strcasestr.c libmagic/strcasestr.c --- libmagic.orig/strcasestr.c 2014-09-11 17:05:33.000000000 +0200 +++ libmagic/strcasestr.c 2020-08-05 15:01:55.644887300 +0200 @@ -39,6 +39,8 @@ #include "file.h" +#include "php_stdint.h" + #include <assert.h> #include <ctype.h> #include <string.h>

📄 Viewing: libmagic.patch

🌑 DarkStealth — WP Plugin Edition

Directory: /usr/src/php-7.4.23/ext/fileinfo