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

libmm-glib,firmware: fix unique_id checks

Browse Source 
The following checks in mm_modem_firmware_select() and
mm_modem_firmware_select_sync() could result in a NULL pointer
dereference if `unique_id' is NULL:

  g_return_if_fail (unique_id != NULL || unique_id[0] == '\0')
  g_return_val_if_fail (unique_id != NULL || unique_id[0] == '\0', FALSE)

This patch fixes the checks to properly verify that `unique_id' is
neither NULL nor an empty string.
This commit is contained in:
Ben Chan
2017-08-02 21:53:14 -07:00
committed by Aleksander Morgado
parent 5accaf504f
commit bae4590784
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmm-glib/mm-modem-firmware.c
View File

@@ -128,7 +128,7 @@ mm_modem_firmware_select (MMModemFirmware *self,
gpointer user_data) gpointer user_data)
{ {
g_return_if_fail (MM_IS_MODEM_FIRMWARE (self)); g_return_if_fail (MM_IS_MODEM_FIRMWARE (self));
g_return_if_fail (unique_id != NULL || unique_id[0] == '\0'); g_return_if_fail (unique_id != NULL && unique_id[0] != '\0');
mm_gdbus_modem_firmware_call_select (MM_GDBUS_MODEM_FIRMWARE (self), unique_id, cancellable, callback, user_data); mm_gdbus_modem_firmware_call_select (MM_GDBUS_MODEM_FIRMWARE (self), unique_id, cancellable, callback, user_data);
} }
@@ -157,7 +157,7 @@ mm_modem_firmware_select_sync (MMModemFirmware *self,
GError **error) GError **error)
{ {
g_return_val_if_fail (MM_IS_MODEM_FIRMWARE (self), FALSE); g_return_val_if_fail (MM_IS_MODEM_FIRMWARE (self), FALSE);
g_return_val_if_fail (unique_id != NULL || unique_id[0] == '\0', FALSE); g_return_val_if_fail (unique_id != NULL && unique_id[0] != '\0', FALSE);
return mm_gdbus_modem_firmware_call_select_sync (MM_GDBUS_MODEM_FIRMWARE (self), unique_id, cancellable, error); return mm_gdbus_modem_firmware_call_select_sync (MM_GDBUS_MODEM_FIRMWARE (self), unique_id, cancellable, error);
} }