diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-08-07 01:15:14 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2019-08-07 01:15:14 -0400 |
| commit | d865756c84df42d176db935f07fde428ca2080b4 (patch) | |
| tree | 171018273a1901d6f77c06c94cf3b90d67e3fdb0 /libpurple/plugins.c | |
| parent | 9a491a5be0a65c2f69c23e7973aef79ac73944c8 (diff) | |
| download | pidgin-d865756c84df42d176db935f07fde428ca2080b4.tar.gz | |
Fix broken `priv != NULL` checks in libpurple.
The `*_get_instance_private` function just returns input value + offset,
so it is impossible for `priv` to be `NULL`.
Diffstat (limited to 'libpurple/plugins.c')
| -rw-r--r-- | libpurple/plugins.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libpurple/plugins.c b/libpurple/plugins.c index 47ab841962..1536f130a8 100644 --- a/libpurple/plugins.c +++ b/libpurple/plugins.c @@ -633,66 +633,66 @@ purple_plugin_info_get_abi_version(const PurplePluginInfo *info) PurplePluginActionsCb purple_plugin_info_get_actions_cb(PurplePluginInfo *info) { - PurplePluginInfoPrivate *priv = - purple_plugin_info_get_instance_private(info); + PurplePluginInfoPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_PLUGIN_INFO(info), NULL); + priv = purple_plugin_info_get_instance_private(info); return priv->actions_cb; } PurplePluginExtraCb purple_plugin_info_get_extra_cb(PurplePluginInfo *info) { - PurplePluginInfoPrivate *priv = - purple_plugin_info_get_instance_private(info); + PurplePluginInfoPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_PLUGIN_INFO(info), NULL); + priv = purple_plugin_info_get_instance_private(info); return priv->extra_cb; } PurplePluginPrefFrameCb purple_plugin_info_get_pref_frame_cb(PurplePluginInfo *info) { - PurplePluginInfoPrivate *priv = - purple_plugin_info_get_instance_private(info); + PurplePluginInfoPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_PLUGIN_INFO(info), NULL); + priv = purple_plugin_info_get_instance_private(info); return priv->pref_frame_cb; } PurplePluginPrefRequestCb purple_plugin_info_get_pref_request_cb(PurplePluginInfo *info) { - PurplePluginInfoPrivate *priv = - purple_plugin_info_get_instance_private(info); + PurplePluginInfoPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_PLUGIN_INFO(info), NULL); + priv = purple_plugin_info_get_instance_private(info); return priv->pref_request_cb; } PurplePluginInfoFlags purple_plugin_info_get_flags(PurplePluginInfo *info) { - PurplePluginInfoPrivate *priv = - purple_plugin_info_get_instance_private(info); + PurplePluginInfoPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, 0); + g_return_val_if_fail(PURPLE_IS_PLUGIN_INFO(info), 0); + priv = purple_plugin_info_get_instance_private(info); return priv->flags; } const gchar * purple_plugin_info_get_error(PurplePluginInfo *info) { - PurplePluginInfoPrivate *priv = - purple_plugin_info_get_instance_private(info); + PurplePluginInfoPrivate *priv = NULL; - g_return_val_if_fail(priv != NULL, NULL); + g_return_val_if_fail(PURPLE_IS_PLUGIN_INFO(info), NULL); + priv = purple_plugin_info_get_instance_private(info); return priv->error; } |