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

Merge branch 'backport-1517-win32-registry-assertions' into 'glib-2-64'

Browse Source 
Backport !1517 “GWin32RegistryKey: Move assertions” to glib-2-64

See merge request GNOME/glib!1520
This commit is contained in:
Sebastian Dröge 2020-07-02 14:30:16 +00:00
commit 2cbd8717e2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gwin32registrykey.c
View File

@ -2334,8 +2334,6 @@ g_win32_registry_key_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_PATH: case PROP_PATH:
g_assert (priv->absolute_path_w == NULL);
g_assert (priv->absolute_path == NULL);
path = g_value_get_string (value); path = g_value_get_string (value);
if (path == NULL) if (path == NULL)
@ -2346,20 +2344,21 @@ g_win32_registry_key_set_property (GObject *object,
if (path_w == NULL) if (path_w == NULL)
break; break;
g_free (priv->absolute_path_w); /* Construct only */
g_free (priv->absolute_path); g_assert (priv->absolute_path_w == NULL);
g_assert (priv->absolute_path == NULL);
priv->absolute_path_w = path_w; priv->absolute_path_w = path_w;
priv->absolute_path = g_value_dup_string (value); priv->absolute_path = g_value_dup_string (value);
break; break;
case PROP_PATH_UTF16: case PROP_PATH_UTF16:
g_assert (priv->absolute_path_w == NULL);
g_assert (priv->absolute_path == NULL);
path_w = (gunichar2 *) g_value_get_pointer (value); path_w = (gunichar2 *) g_value_get_pointer (value);
if (path_w == NULL) if (path_w == NULL)
break; break;
/* Construct only */
g_assert (priv->absolute_path_w == NULL);
priv->absolute_path_w = g_wcsdup (path_w, -1); priv->absolute_path_w = g_wcsdup (path_w, -1);
break; break;