Attachment 128043 Details for Bug 98283 – Protects 2 more dereferences against NULL

Protects 2 more dereferences against NULL

qmi-device.patch (text/plain), 1.73 KB, created by Benoît Donnette on 2016-11-17 15:55:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benoît Donnette

Created: 2016-11-17 15:55:43 UTC

Size: 1.73 KB

patch

obsolete

>--- ../libqmi-1.16.0/src/libqmi-glib/qmi-device.c	2016-11-04 10:51:52.870085915 +0100
>+++ src/libqmi-glib/qmi-device.c	2016-11-03 15:18:04.077950054 +0100
>@@ -244,14 +244,16 @@
>     GError *error = NULL;
> 
>     tr = device_release_transaction (ctx->self, ctx->key);
>-    tr->timeout_source = NULL;
>+    if (tr) {
>+        tr->timeout_source = NULL;
> 
>-    /* Complete transaction with a timeout error */
>-    error = g_error_new (QMI_CORE_ERROR,
>-                         QMI_CORE_ERROR_TIMEOUT,
>-                         "Transaction timed out");
>-    transaction_complete_and_free (tr, NULL, error);
>-    g_error_free (error);
>+        /* Complete transaction with a timeout error */
>+        error = g_error_new (QMI_CORE_ERROR,
>+                             QMI_CORE_ERROR_TIMEOUT,
>+                             "Transaction timed out");
>+        transaction_complete_and_free (tr, NULL, error);
>+        g_error_free (error);
>+    }
> 
>     return FALSE;
> }
>@@ -264,14 +266,16 @@
>     GError *error = NULL;
> 
>     tr = device_release_transaction (ctx->self, ctx->key);
>-    tr->cancellable_id = 0;
>+    if (tr) {
>+        tr->cancellable_id = 0;
> 
>-    /* Complete transaction with an abort error */
>-    error = g_error_new (QMI_PROTOCOL_ERROR,
>-                         QMI_PROTOCOL_ERROR_ABORTED,
>-                         "Transaction aborted");
>-    transaction_complete_and_free (tr, NULL, error);
>-    g_error_free (error);
>+        /* Complete transaction with an abort error */
>+        error = g_error_new (QMI_PROTOCOL_ERROR,
>+                             QMI_PROTOCOL_ERROR_ABORTED,
>+                             "Transaction aborted");
>+        transaction_complete_and_free (tr, NULL, error);
>+        g_error_free (error);
>+    }
> }
> 
> static gboolean

Actions: View

Attachments on bug 98283: 128043

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.