Skip to content

Commit 1df558c

Browse files
committed
Fixed bug #66946 extensive backtracking in awk rule regular expression
CVE-2013-7345 Applied upstream patch: file/file@ef2329c Add the magicdata.patch to track patches applied to upstream data file.
1 parent 6612e1b commit 1df558c

File tree

1 file changed

+39
-0
lines changed

1 file changed

+39
-0
lines changed

ext/fileinfo/magicdata.patch

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Patches applied to file sources tree before generating magic.mgc
2+
and before running create_data_file.php to create data_file.c.
3+
4+
5+
6+
From ef2329cf71acb59204dd981e2c6cce6c81fe467c Mon Sep 17 00:00:00 2001
7+
From: Christos Zoulas <christos@zoulas.com>
8+
Date: Mon, 25 Mar 2013 14:06:55 +0000
9+
Subject: [PATCH] limit to 100 repetitions to avoid excessive backtracking
10+
Carsten Wolff
11+
12+
---
13+
magic/Magdir/commands | 4 ++--
14+
1 file changed, 2 insertions(+), 2 deletions(-)
15+
16+
diff --git a/magic/Magdir/commands b/magic/Magdir/commands
17+
index 67c3eee..4a7d8dd 100644
18+
--- a/magic/Magdir/commands
19+
+++ b/magic/Magdir/commands
20+
@@ -1,6 +1,6 @@
21+
22+
#------------------------------------------------------------------------------
23+
-# $File: commands,v 1.44 2013/02/05 15:20:47 christos Exp $
24+
+# $File: commands,v 1.45 2013/02/06 14:18:52 christos Exp $
25+
# commands: file(1) magic for various shells and interpreters
26+
#
27+
#0 string/w : shell archive or script for antique kernel text
28+
@@ -49,7 +49,7 @@
29+
!:mime text/x-awk
30+
0 string/wt #!\ /usr/bin/awk awk script text executable
31+
!:mime text/x-awk
32+
-0 regex =^\\s*BEGIN\\s*[{] awk script text
33+
+0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text
34+
35+
# AT&T Bell Labs' Plan 9 shell
36+
0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable
37+
--
38+
1.8.5.5
39+

0 commit comments

Comments
 (0)