diff options
| author | Ben Chan <benchan@chromium.org> | 2019-07-31 21:48:48 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2019-09-08 14:47:36 +0200 |
| commit | c196a9aa6f958690c6481598a785df3bb99ca762 (patch) | |
| tree | 1547effa12fb6ead3afeb7b827a438fc6f6345d5 | |
| parent | f2c8c2169fee920100b5cbcf986ae4349cba3da7 (diff) | |
qmicli,loc: fix potential dereference of null GArray
This patch fixes a potential dereference of a null GArray in
gnss_sv_info_received().
(cherry picked from commit a0174632f57f86aca4f37f41ee341fc6e63ddd7d)
| -rw-r--r-- | src/qmicli/qmicli-loc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qmicli/qmicli-loc.c b/src/qmicli/qmicli-loc.c index 6fc2845..6156a47 100644 --- a/src/qmicli/qmicli-loc.c +++ b/src/qmicli/qmicli-loc.c @@ -276,7 +276,7 @@ gnss_sv_info_received (QmiClientLoc *client, QmiIndicationLocGnssSvInfoOutput *output) { GArray *satellite_infos = NULL; - guint i; + guint i, num_satellite_infos; gboolean altitude_assumed; if (qmi_indication_loc_gnss_sv_info_output_get_altitude_assumed (output, &altitude_assumed, NULL)) @@ -286,8 +286,9 @@ gnss_sv_info_received (QmiClientLoc *client, qmi_indication_loc_gnss_sv_info_output_get_list (output, &satellite_infos, NULL); - g_print ("[gnss sv info] %d satellites detected:\n", satellite_infos ? satellite_infos->len : 0); - for (i = 0; i < satellite_infos->len; i++) { + num_satellite_infos = satellite_infos ? satellite_infos->len : 0; + g_print ("[gnss sv info] %d satellites detected:\n", num_satellite_infos); + for (i = 0; i < num_satellite_infos; i++) { QmiIndicationLocGnssSvInfoOutputListElement *element; element = &g_array_index (satellite_infos, QmiIndicationLocGnssSvInfoOutputListElement, i); |