diff options
author | Dan Williams <dcbw@redhat.com> | 2012-03-23 10:15:39 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2012-03-23 10:15:39 -0500 |
commit | 26e3059aa73a19ba2ec5010da491eae39086fad7 (patch) | |
tree | 23f06c126d0bef29e214783cbdd7a1fff05ccab6 | |
parent | 5a40ac2779282e31cef94865687fb16e9ce4ff1a (diff) |
serial: fix crash when sending some commands to a closed port (lp:963102)
If the command we're sending doesn't have a callback, don't try
to call NULL. Triggered if the port got closed (because the modem
crashed, or refcounting errors or whatever) with some code like this:
mm_at_serial_port_queue_command (MM_AT_SERIAL_PORT (port), "+CREG=0", 3, NULL, NULL);
-rw-r--r-- | src/mm-serial-port.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c index b7b5a73b..032b2c4e 100644 --- a/src/mm-serial-port.c +++ b/src/mm-serial-port.c @@ -962,7 +962,8 @@ internal_queue_command (MMSerialPort *self, GError *error = g_error_new_literal (MM_SERIAL_ERROR, MM_SERIAL_ERROR_SEND_FAILED, "Sending command failed: device is not enabled"); - callback (self, NULL, error, user_data); + if (callback) + callback (self, NULL, error, user_data); g_error_free (error); return; } |