git Service des IN-Ulm e.V. Erkunden Hilfe
Anmelden
cbiedl
/
file
1
0
Fork 0
Dateien Pull-Requests 0 Wiki
Struktur: squeeze/5.
Branches Tags
file
/
debian
/
patches
/
CVE-2014-8117.5.5063ca3.patch

CVE-2014-8117.5.5063ca3.patch 1.8 KB
Permalink Verlauf Originalformat

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172 
  1. Subject: Document changes
    2. 

  2. Upstream-Author: Christos Zoulas <christos@zoulas.com>
    3. 

  3. Date: Thu Nov 27 16:15:06 2014 +0000
    4. 

  4. Origin: FILE5_20-35-g5063ca3
    5. 

  5. Last-Update: 2015-01-09
    6. 

  6. 

  7. --- a/doc/file.man
    8. 

  8. +++ b/doc/file.man
    9. 

  9. @@ -16,6 +16,7 @@
    10. 

  10.  .Op Fl F Ar separator
    11. 

  11.  .Op Fl f Ar namefile
    12. 

  12.  .Op Fl m Ar magicfiles
    13. 

  13. +.Op Fl R Ar maxrecursion
    14. 

  14.  .Ar
    15. 

  15.  .Ek -words
    16. 

  16.  .Nm
    17. 

  17. @@ -278,6 +279,11 @@
    18. 

  18.  Normally
    19. 

  19.  .Nm
    20. 

  20.  translates unprintable characters to their octal representation.
    21. 

  21. +.It Fl R , Fl Fl recursion Ar maxlevel
    22. 

  22. +Set the maximum recursion level for indirect type magic or name/use entry
    23. 

  23. +invocations.
    24. 

  24. +The default is
    25. 

  25. +.Dv 15 .
    26. 

  26.  .It Fl s , -special-files
    27. 

  27.  Normally,
    28. 

  28.  .Nm
    29. 

  29. --- a/doc/libmagic.man
    30. 

  30. +++ b/doc/libmagic.man
    31. 

  31. @@ -38,6 +38,8 @@
    32. 

  32.  .Nm magic_check ,
    33. 

  33.  .Nm magic_compile ,
    34. 

  34.  .Nm magic_load
    35. 

  35. +.Nm magic_setparam ,
    36. 

  36. +.Nm magic_getparam ,
    37. 

  37.  .Nd Magic number recognition library.
    38. 

  38.  .Sh LIBRARY
    39. 

  39.  .Lb libmagic
    40. 

  40. @@ -62,7 +64,9 @@
    41. 

  41.  .Ft int
    42. 

  42.  .Fn magic_compile "magic_t cookie, const char *filename"
    43. 

  43.  .Ft int
    44. 

  44. -.Fn magic_load "magic_t cookie, const char *filename"
    45. 

  45. +.Fn magic_getparam "magic_t cookie" "int param" "void *value"
    46. 

  46. +.Ft int
    47. 

  47. +.Fn magic_setparam "magic_t cookie" "int param" "const void *value"
    48. 

  48.  .Sh DESCRIPTION
    49. 

  49.  These functions
    50. 

  50.  operate on the magic database file
    51. 

  51. @@ -204,6 +208,21 @@
    52. 

  52.  adds
    53. 

  53.  .Dq .mgc
    54. 

  54.  to the database filename as appropriate.
    55. 

  55. +.Pp
    56. 

  56. +The
    57. 

  57. +.Fn magic_getparam
    58. 

  58. +and
    59. 

  59. +.Fn magic_setparam
    60. 

  60. +allow getting and setting various limits related to the the magic
    61. 

  61. +library.
    62. 

  62. +.Bl -column "MAGIC_PARAM_MAX_RECURSION" "size_t" "Default" -offset indent
    63. 

  63. +.It Sy "Parameter" Ta Sy "Type" Ta Sy "Default
    64. 

  64. +.It Li MAGIC_PARAM_MAX_RECURSION Ta size_t Ta 15
    65. 

  65. +.El
    66. 

  66. +The
    67. 

  67. +.Dv MAGIC_PARAM_MAX_RECURSION
    68. 

  68. +parameter controls how many levels of recursion will be followed for
    69. 

  69. +indirect magic entries or for name/use calls.
    70. 

  70.  .Sh RETURN VALUES
    71. 

  71.  The function
    72. 

  72.  .Fn magic_open
    73.