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

GUnixSocketAddress: fix construct parameter issue

Browse Source 
GUnixSocketAddress has some very strange logic for interpreting its
construct paramters.  This logic behaves differently in these two cases:

  g_object_new (G_TYPE_UNIX_SOCKET_ADDRESS,
                "abstract", FALSE,
                "address-type", ...,
                NULL);

and

  g_object_new (G_TYPE_UNIX_SOCKET_ADDRESS,
                "address-type", ...,
                NULL);

even though the default value for "abstract" is already FALSE.

Change the way the code works so that it is not sensitive to people
merely setting a property to its default value.

https://bugzilla.gnome.org/show_bug.cgi?id=698686
This commit is contained in:
Ryan Lortie 2013-04-23 13:38:33 -04:00
parent 7409ac0d14
commit 9c243beea2
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gio/gunixsocketaddress.c
View File

@ -117,26 +117,15 @@ g_unix_socket_address_set_property (GObject *object,
break;
case PROP_ABSTRACT:
/* If the caller already set PROP_ADDRESS_TYPE, don't let the
* default value of PROP_ABSTRACT overwrite it.
*/
if (address->priv->address_type != G_UNIX_SOCKET_ADDRESS_INVALID)
return;
/* Only set it if it's not the default... */
if (g_value_get_boolean (value))
address->priv->address_type = G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED;
else
address->priv->address_type = G_UNIX_SOCKET_ADDRESS_PATH;
address->priv->address_type = G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED;
break;
case PROP_ADDRESS_TYPE:
/* If the caller already set PROP_ABSTRACT, don't let the
* default value of PROP_ADDRESS_TYPE overwrite it.
*/
if (address->priv->address_type != G_UNIX_SOCKET_ADDRESS_INVALID)
return;
address->priv->address_type = g_value_get_enum (value);
/* Only set it if it's not the default... */
if (g_value_get_enum (value) != G_UNIX_SOCKET_ADDRESS_PATH)
address->priv->address_type = g_value_get_enum (value);
break;
default:
@ -322,7 +311,7 @@ g_unix_socket_address_init (GUnixSocketAddress *address)
memset (address->priv->path, 0, sizeof (address->priv->path));
address->priv->path_len = -1;
address->priv->address_type = G_UNIX_SOCKET_ADDRESS_INVALID;
address->priv->address_type = G_UNIX_SOCKET_ADDRESS_PATH;
}
/**