components/python/pygments/patches/CVE-2015-8557.patch
author Danek Duvall <danek.duvall@oracle.com>
Wed, 20 Jan 2016 16:02:48 -0800
branchs11u3-sru
changeset 5316 1312ff3232f3
permissions -rw-r--r--
22364960 problem in PYTHON-MOD/PYGMENTS
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5316
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     1
This patch is pulled from upstream; once we pull in 2.1 or newer, it will
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     2
no longer be necessary.
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     3
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     4
--- Pygments-1.6/pygments/formatters/img.py	Sun Feb  3 01:26:49 2013
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     5
+++ Pygments-1.6/pygments/formatters/img.py	Wed Jan 20 13:33:20 2016
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     6
@@ -15,6 +15,8 @@
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     7
 from pygments.util import get_bool_opt, get_int_opt, \
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     8
      get_list_opt, get_choice_opt
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
     9
 
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    10
+import subprocess
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    11
+
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    12
 # Import this carefully
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    13
 try:
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    14
     from PIL import Image, ImageDraw, ImageFont
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    15
@@ -72,11 +74,11 @@
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    16
             self._create_nix()
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    17
 
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    18
     def _get_nix_font_path(self, name, style):
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    19
-        from commands import getstatusoutput
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    20
-        exit, out = getstatusoutput('fc-list "%s:style=%s" file' %
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    21
-                                    (name, style))
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    22
-        if not exit:
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    23
-            lines = out.splitlines()
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    24
+        proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    25
+                                stdout=subprocess.PIPE, stderr=None)
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    26
+        stdout, _ = proc.communicate()
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    27
+        if proc.returncode == 0:
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    28
+            lines = stdout.splitlines()
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    29
             if lines:
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    30
                 path = lines[0].strip().strip(':')
1312ff3232f3 22364960 problem in PYTHON-MOD/PYGMENTS
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset
    31
                 return path