diff options
| author |   Saman Mahmoodi <mahmoudi.saman1@gmail.com> | 2021-02-16 16:47:11 +0330 |
|---|---|---|
| committer | Saman Mahmoodi <mahmoudi.saman1@gmail.com> | 2021-04-07 07:44:22 +0430 |
| commit | 495dbef34079fe860ba0c2cd83a07b086b5a2417 (patch) | |
| tree | 0366609fd1f77d75abc4529562c4d9d18553c439 | |
| parent | 4fcf73385e8d7a5296b21eb0b78f12982b8138b8 (diff) | |
Fixing pincode problemmarlin_12.90.0marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.012.90.011.92.011.91.0
In get_pincode function there was a problem as below:
when the set_pincode verb is not called so in the DB we have not any pincode then for pairing it should use default pincode as 1234
in the get_pincode function when is called read verb from persistence, if pincode does not exist the pincode variable is NULL so we should check the pincode variable and if is NULL, we should assign default value as 1234
Bug-AGL: SPEC-3814
Signed-off-by: Saman Mahmoodi <mahmoudi.saman1@gmail.com>
Change-Id: I5f72834d2dcd8ecd3861fc894f4b1a7ebd7efc04
| -rw-r--r-- | binding/bluetooth-api.c | 2 | ||||
| -rw-r--r-- | binding/bluetooth-conf.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/binding/bluetooth-api.c b/binding/bluetooth-api.c index 3fcf841..2bcddd9 100644 --- a/binding/bluetooth-api.c +++ b/binding/bluetooth-api.c @@ -236,6 +236,8 @@ void call_work_destroy_unlocked(struct call_work *cw) g_free(cw->type_arg); g_free(cw->method); g_free(cw->bluez_method); + g_free(cw->agent_data.fixed_pincode); + cw->agent_data.fixed_pincode = NULL; } void call_work_destroy(struct call_work *cw) diff --git a/binding/bluetooth-conf.c b/binding/bluetooth-conf.c index b4dea34..a5824bb 100644 --- a/binding/bluetooth-conf.c +++ b/binding/bluetooth-conf.c @@ -90,8 +90,8 @@ gchar *get_pincode(afb_api_t api) if (json_object_object_get_ex(response, "value", &val)) pincode = g_strdup(json_object_get_string(val)); - else - pincode = "1234"; + if (!pincode) + pincode = g_strdup("1234"); json_object_put(response); return pincode; |