Skip to content

fileinfo: don't compile libmagic/strcasestr.c #21522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iluuu1994 merged 3 commits into from
Mar 25, 2026
+14 −13
Merged

fileinfo: don't compile libmagic/strcasestr.c #21522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c27cb6
ext/fileinfo/libmagic/file.h: delete HAVE_STRCASESTR ifdef
orlitzky Mar 25, 2026
800800f
ext/fileinfo/libmagic.patch: update
orlitzky Mar 25, 2026
cbb90c7
ext/fileinfo/config.{m4,w32}: don't compile strcasestr.c
orlitzky Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ext/fileinfo/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ if test "$PHP_FILEINFO" != "no"; then

AC_CHECK_HEADERS([sys/sysmacros.h])

AC_CHECK_FUNCS([strcasestr],,[
AC_MSG_NOTICE([using libmagic strcasestr implementation])
libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
])

AX_GCC_FUNC_ATTRIBUTE([visibility])

PHP_NEW_EXTENSION([fileinfo],
Expand Down
2 changes: 1 addition & 1 deletion ext/fileinfo/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (PHP_FILEINFO != 'no') {
encoding.c fsmagic.c funcs.c \
is_json.c is_tar.c is_simh.c magic.c print.c \
readcdf.c softmagic.c der.c \
strcasestr.c buffer.c is_csv.c";
buffer.c is_csv.c";

EXTENSION('fileinfo', 'fileinfo.c php_libmagic.c', true, "/I" + configure_module_dirname + "/libmagic /I" + configure_module_dirname);
ADD_EXTENSION_DEP('fileinfo', 'pcre');
Expand Down
17 changes: 13 additions & 4 deletions ext/fileinfo/libmagic.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,7 @@ diff -u libmagic.orig/encoding.c libmagic/encoding.c
}
diff -u libmagic.orig/file.h libmagic/file.h
--- libmagic.orig/file.h 2024-11-27 10:37:00.000000000 -0500
+++ libmagic/file.h 2026-03-24 10:45:21.427536159 -0400
+++ libmagic/file.h 2026-03-25 08:13:23.336328498 -0400
@@ -27,15 +27,13 @@
*/
/*
Expand Down Expand Up @@ -1883,7 +1883,7 @@ diff -u libmagic.orig/file.h libmagic/file.h
typedef struct {
char *buf;
size_t blen;
@@ -649,19 +629,6 @@
@@ -649,28 +629,12 @@
extern file_protected const size_t file_nnames;
#endif

Expand All @@ -1903,7 +1903,16 @@ diff -u libmagic.orig/file.h libmagic/file.h
#ifndef HAVE_STRLCPY
size_t strlcpy(char *, const char *, size_t);
#endif
@@ -681,31 +648,6 @@
#ifndef HAVE_STRLCAT
size_t strlcat(char *, const char *, size_t);
#endif
-#ifndef HAVE_STRCASESTR
-char *strcasestr(const char *, const char *);
-#endif
#ifndef HAVE_GETLINE
ssize_t getline(char **, size_t *, FILE *);
ssize_t getdelim(char **, size_t *, int, FILE *);
@@ -681,31 +645,6 @@
#ifndef HAVE_ASCTIME_R
char *asctime_r(const struct tm *, char *);
#endif
Expand Down Expand Up @@ -3066,7 +3075,7 @@ diff -u libmagic.orig/magic.c libmagic/magic.c
}
return file_getbuffer(ms);
diff -u libmagic.orig/magic.h libmagic/magic.h
--- libmagic.orig/magic.h 2026-03-24 10:45:56.975553410 -0400
--- libmagic.orig/magic.h 2026-03-25 08:16:04.280413419 -0400
+++ libmagic/magic.h 2026-03-20 12:10:19.777614667 -0400
@@ -47,8 +47,6 @@
* extensions */
Expand Down
3 changes: 0 additions & 3 deletions ext/fileinfo/libmagic/file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,9 +635,6 @@ size_t strlcpy(char *, const char *, size_t);
#ifndef HAVE_STRLCAT
size_t strlcat(char *, const char *, size_t);
#endif
#ifndef HAVE_STRCASESTR
char *strcasestr(const char *, const char *);
#endif
#ifndef HAVE_GETLINE
ssize_t getline(char **, size_t *, FILE *);
ssize_t getdelim(char **, size_t *, int, FILE *);
Expand Down
Loading