Skip to content

Commit 1158b04

Browse files
committed
Add support for two new max_* params, max_encoding and max_elf_shsize
1 parent a4b309e commit 1158b04

4 files changed

Lines changed: 30 additions & 1 deletion

File tree

Changes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{{$NEXT}}
22

3+
- Added support for two new limit params added in more recent file versions, max_encoding and
4+
max_elf_shsize.
5+
6+
37
1.23 2020-08-28
48

59
- Fixed a bug with the Makefile.PL that caused every call to "make" to

const/inc.c

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,15 @@ constant (pTHX_ const char *name, STRLEN len, IV *iv_return) {
166166
Regenerate these constant functions by feeding this entire source file to
167167
perl -x
168168
169-
#!/home/autarch/perl5/perlbrew/perls/perl-5.30.1/bin/perl -w
169+
#!/home/autarch/perl5/perlbrew/perls/perl-5.40.2/bin/perl -w
170170
use ExtUtils::Constant qw (constant_types C_constant XS_constant);
171171
172172
my $types = {map {($_, 1)} qw(IV)};
173173
my @names = (qw(MAGIC_CHECK MAGIC_COMPRESS MAGIC_CONTINUE MAGIC_DEBUG
174174
MAGIC_DEVICES MAGIC_ERROR MAGIC_MIME MAGIC_NONE
175175
MAGIC_PARAM_BYTES_MAX MAGIC_PARAM_ELF_NOTES_MAX
176176
MAGIC_PARAM_ELF_PHNUM_MAX MAGIC_PARAM_ELF_SHNUM_MAX
177+
MAGIC_PARAM_ELF_SHSIZE_MAX MAGIC_PARAM_ENCODING_MAX
177178
MAGIC_PARAM_INDIR_MAX MAGIC_PARAM_NAME_MAX MAGIC_PARAM_REGEX_MAX
178179
MAGIC_PRESERVE_ATIME MAGIC_RAW MAGIC_SYMLINK));
179180
@@ -319,9 +320,29 @@ __END__
319320
case 21:
320321
return constant_21 (aTHX_ name, iv_return);
321322
break;
323+
case 24:
324+
if (memEQ(name, "MAGIC_PARAM_ENCODING_MAX", 24)) {
325+
#ifdef MAGIC_PARAM_ENCODING_MAX
326+
*iv_return = MAGIC_PARAM_ENCODING_MAX;
327+
return PERL_constant_ISIV;
328+
#else
329+
return PERL_constant_NOTDEF;
330+
#endif
331+
}
332+
break;
322333
case 25:
323334
return constant_25 (aTHX_ name, iv_return);
324335
break;
336+
case 26:
337+
if (memEQ(name, "MAGIC_PARAM_ELF_SHSIZE_MAX", 26)) {
338+
#ifdef MAGIC_PARAM_ELF_SHSIZE_MAX
339+
*iv_return = MAGIC_PARAM_ELF_SHSIZE_MAX;
340+
return PERL_constant_ISIV;
341+
#else
342+
return PERL_constant_NOTDEF;
343+
#endif
344+
}
345+
break;
325346
}
326347
return PERL_constant_NOTFOUND;
327348
}

lib/File/LibMagic.pm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ my @all_params = qw(
6363
max_elf_notes
6464
max_regex
6565
max_bytes
66+
max_encoding
67+
max_elf_shsize
6668
);
6769

6870
## no critic ( Subroutines::ProhibitUnusedPrivateSubroutines)

lib/File/LibMagic/Constants.pm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ sub constants {
2929
MAGIC_PARAM_ELF_NOTES_MAX
3030
MAGIC_PARAM_REGEX_MAX
3131
MAGIC_PARAM_BYTES_MAX
32+
MAGIC_PARAM_ENCODING_MAX
33+
MAGIC_PARAM_ELF_SHSIZE_MAX
3234
);
3335
}
3436

0 commit comments

Comments
 (0)