luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3649-win32-wchar-crash' into 'main'

Browse Source 
gwin32appinfo: Fix an incorrect size vs wide-length comparison

Closes #3649

See merge request GNOME/glib!4572
This commit is contained in:
Philip Withnall
2025-04-02 11:35:12 +00:00
parent afb5ba1ea1 585ec33763
commit 4820b1bd79
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gio/gwin32appinfo.c
View File

@@ -1550,7 +1550,7 @@ process_verbs_commands (GList *verbs,
if (verb_key)
{
gsize verb_displayname_len;
size_t verb_displayname_size;
got_value = g_win32_registry_key_get_value_w (verb_key,
g_win32_registry_get_os_dirs_w (),
@@ -1558,12 +1558,12 @@ process_verbs_commands (GList *verbs,
L"MUIVerb",
&val_type,
(void **) &verb_displayname,
&verb_displayname_len,
&verb_displayname_size,
NULL);
if (got_value &&
val_type == G_WIN32_REGISTRY_VALUE_STR &&
verb_displayname_len > sizeof (gunichar2))
verb_displayname_size > sizeof (gunichar2))
verb_displayname_u8 = g_utf16_to_utf8 (verb_displayname, -1, NULL, NULL, NULL);
g_clear_pointer (&verb_displayname, g_free);
@@ -1576,12 +1576,12 @@ process_verbs_commands (GList *verbs,
L"",
&val_type,
(void **) &verb_displayname,
&verb_displayname_len,
&verb_displayname_size,
NULL);
if (got_value &&
val_type == G_WIN32_REGISTRY_VALUE_STR &&
verb_displayname_len > sizeof (gunichar2))
verb_displayname_size > sizeof (gunichar2))
verb_displayname_u8 = g_utf16_to_utf8 (verb_displayname, -1, NULL, NULL, NULL);
}
@@ -1623,7 +1623,7 @@ process_uwp_verbs (GList *verbs,
gboolean got_value;
GWin32RegistryValueType val_type;
gunichar2 *acid;
gsize acid_len;
size_t acid_size;
key = _g_win32_registry_key_build_and_new_w (NULL, path_to_progid, progid,
L"\\", verb->shellpath, NULL);
@@ -1642,12 +1642,12 @@ process_uwp_verbs (GList *verbs,
L"ActivatableClassId",
&val_type,
(void **) &acid,
&acid_len,
&acid_size,
NULL);
if (got_value &&
val_type == G_WIN32_REGISTRY_VALUE_STR &&
acid_len > sizeof (gunichar2))
acid_size > sizeof (gunichar2))
{
/* TODO: default value of a shell subkey, if not empty,
* might contain something like @{Some.Identifier_1234.456.678.789_some_words?ms-resource://Arbitrary.Path/Pointing/Somewhere}
@@ -3669,10 +3669,7 @@ grab_registry_string (GWin32RegistryKey *handler_appkey,
/* There's no way for us to resolve "ms-resource:..." strings */
if (value != NULL &&
value_size >= ms_resource_prefix_len &&
memcmp (value,
ms_resource_prefix,
ms_resource_prefix_len * sizeof (gunichar2)) == 0)
wcsncmp (value, ms_resource_prefix, ms_resource_prefix_len) == 0)
g_clear_pointer (&value, g_free);
if (value == NULL)

4
gio/gwin32registrykey.c
View File

@@ -1978,7 +1978,7 @@ g_win32_registry_get_os_dirs (void)
* @value_type: (out) (optional): type of the value retrieved.
* @value_data: (out callee-allocates) (optional): contents of the value.
* @value_data_size: (out) (optional): size of the buffer pointed
* by @value_data.
* by @value_data, in bytes.
* @error: (nullable): a pointer to %NULL #GError, or %NULL
*
* Get data from a value of a key. String data is guaranteed to be
@@ -2245,7 +2245,7 @@ MuiRegQueryValueExW (HKEY hKey,
* @value_type: (out) (optional): type of the value retrieved.
* @value_data: (out callee-allocates) (optional): contents of the value.
* @value_data_size: (out) (optional): size of the buffer pointed
* by @value_data.
* by @value_data, in bytes.
* @error: (nullable): a pointer to %NULL #GError, or %NULL
*
* Get data from a value of a key. String data is guaranteed to be