luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3186-gpt-sniff-buffer' into 'main'

Browse Source 
glocalfileinfo: Increase size of the content-type sniff buffer to 16KiB

Closes #3186

See merge request GNOME/glib!3730
This commit is contained in:
Philip Withnall 2023-11-27 14:14:40 +00:00
commit 5070f3fe80
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/glocalfileinfo.c
View File

@ -1345,7 +1345,11 @@ get_content_type (const char *basename,
#if !defined(G_OS_WIN32) && !defined(__APPLE__) #if !defined(G_OS_WIN32) && !defined(__APPLE__)
if (!fast && result_uncertain && path != NULL) if (!fast && result_uncertain && path != NULL)
{ {
guchar sniff_buffer[4096]; /* Sniff the first 16KiB of the file (sometimes less, if xdgmime
* says it doesn’t need so much). Most files need less than 4KiB of
* sniffing, but some disk images need more (see
* https://gitlab.gnome.org/GNOME/glib/-/issues/3186). */
guchar sniff_buffer[16384];
gsize sniff_length; gsize sniff_length;
#ifdef O_NOATIME #ifdef O_NOATIME
int errsv; int errsv;
@ -1353,8 +1357,8 @@ get_content_type (const char *basename,
int fd; int fd;
sniff_length = _g_unix_content_type_get_sniff_len (); sniff_length = _g_unix_content_type_get_sniff_len ();
if (sniff_length == 0 || sniff_length > 4096) if (sniff_length == 0 || sniff_length > sizeof (sniff_buffer))
sniff_length = 4096; sniff_length = sizeof (sniff_buffer);
#ifdef O_NOATIME #ifdef O_NOATIME
fd = g_open (path, O_RDONLY | O_NOATIME | O_CLOEXEC, 0); fd = g_open (path, O_RDONLY | O_NOATIME | O_CLOEXEC, 0);