colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plugin: check error returned by g_task_propagate_error instead

Browse Source 
mm_plugin_supports_port_finish directly casts the value returned by
g_task_propagate_int to MMPluginSupportsResult enum value, which
implicitly assumes MM_PLUGIN_SUPPORTS_PORT_UNKNOWN equals to -1.
Instead of relying on such an implicit assumption, this patch modifies
the code to check if the GError argument to g_task_propagate_error is
populated instead.
This commit is contained in:
Ben Chan
2017-07-06 11:30:21 -07:00
committed by Aleksander Morgado
parent a36347eff7
commit 627ef274df
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mm-plugin.c
View File

@@ -666,10 +666,18 @@ mm_plugin_supports_port_finish (MMPlugin *self,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
GError *inner_error = NULL;
gssize value;
g_return_val_if_fail (MM_IS_PLUGIN (self), MM_PLUGIN_SUPPORTS_PORT_UNKNOWN); g_return_val_if_fail (MM_IS_PLUGIN (self), MM_PLUGIN_SUPPORTS_PORT_UNKNOWN);
g_return_val_if_fail (G_IS_TASK (result), MM_PLUGIN_SUPPORTS_PORT_UNKNOWN); g_return_val_if_fail (G_IS_TASK (result), MM_PLUGIN_SUPPORTS_PORT_UNKNOWN);
return (MMPluginSupportsResult) g_task_propagate_int (G_TASK (result), error); value = g_task_propagate_int (G_TASK (result), &inner_error);
if (inner_error) {
g_propagate_error (error, inner_error);
return MM_PLUGIN_SUPPORTS_PORT_UNKNOWN;
}
return (MMPluginSupportsResult)value;
} }
void void