summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChristos Zoulas <christos@zoulas.com>2015-09-11 17:24:09 +0000
committerChristos Zoulas <christos@zoulas.com>2015-09-11 17:24:09 +0000
commitb9bbc26011fa5be83d88b3abae153866fef9c5d5 (patch)
treec1e42a6f4ad4691d0b518c7cd96c743d2f4060c8 /doc
parent4a1cf9379d51503bdd87f022a1cc6f2bd1943277 (diff)
downloadfile-git-b9bbc26011fa5be83d88b3abae153866fef9c5d5.tar.gz
PR/474: Add a limit to the size of regex searches to prevent performance
issues.
Diffstat (limited to 'doc')
-rw-r--r--doc/file.man5
-rw-r--r--doc/libmagic.man5
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/file.man b/doc/file.man
index 01e1fc2e..74518ee6 100644
--- a/doc/file.man
+++ b/doc/file.man
@@ -1,5 +1,5 @@
-.\" $File: file.man,v 1.116 2015/06/03 18:21:24 christos Exp $
-.Dd June 3, 2015
+.\" $File: file.man,v 1.117 2015/06/03 19:51:27 christos Exp $
+.Dd September 11, 2015
.Dt FILE __CSECTION__
.Os
.Sh NAME
@@ -316,6 +316,7 @@ Set various parameter limits.
.It Li elf_notes Ta 256 Ta max ELF notes processed
.It Li elf_phnum Ta 128 Ta max ELF program sections processed
.It Li elf_shnum Ta 32768 Ta max ELF sections processed
+.It Li regex Ta 8192 Ta length limit for regex searches
.El
.It Fl r , Fl Fl raw
Don't translate unprintable characters to \eooo.
diff --git a/doc/libmagic.man b/doc/libmagic.man
index a5c8e2e1..0cbcd4da 100644
--- a/doc/libmagic.man
+++ b/doc/libmagic.man
@@ -1,4 +1,4 @@
-.\" $File: libmagic.man,v 1.36 2015/04/10 15:36:01 christos Exp $
+.\" $File: libmagic.man,v 1.37 2015/06/03 18:21:24 christos Exp $
.\"
.\" Copyright (c) Christos Zoulas 2003.
.\" All Rights Reserved.
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd June 3, 2015
+.Dd September 11, 2015
.Dt LIBMAGIC 3
.Os
.Sh NAME
@@ -291,6 +291,7 @@ library.
.It Li MAGIC_PARAM_ELF_NOTES_MAX Ta size_t Ta 256
.It Li MAGIC_PARAM_ELF_PHNUM_MAX Ta size_t Ta 128
.It Li MAGIC_PARAM_ELF_SHNUM_MAX Ta size_t Ta 32768
+.It Li MAGIC_PARAM_REGEX_MAX Ta size_t Ta 8192
.El
.Pp
The