device: Fix not clearing error on update_bredr_services
Luiz Augusto von Dentz
maintainerPATCH v2 1/1 device: Fix not clearing error on update_bredr_services
From: Luiz Augusto von Dentz <[email protected]>
When trying to loads contents from file using g_key_file_load_from_file it may cause an error which needs to be cleared since the gerr is reused, also make sure the file is always created upfront to avoid having such error when storage has not been initialized.
--- src/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
src/device.c +10 -6
@@ -4998,22 +4998,28 @@ static void update_bredr_services(struct browse_req *req, sdp_list_t *recs)snprintf (sdp_file,PATH_MAX ,STORAGEDIR "/%s/cache/%s" , srcaddr, dstaddr); +create_file (sdp_file,0600 ); sdp_key_file =g_key_file_new ();if (!g_key_file_load_from_file (sdp_key_file, sdp_file,0 , &gerr)) {error ("Unable to load key file from %s: (%s)" , sdp_file, gerr->message); -g_error_free (gerr); +g_clear_error (&gerr); +g_key_file_free (sdp_key_file); + sdp_key_file =NULL ; }snprintf (att_file,PATH_MAX ,STORAGEDIR "/%s/%s/attributes" , srcaddr, dstaddr); +create_file (att_file,0600 ); att_key_file =g_key_file_new ();if (!g_key_file_load_from_file (att_key_file, att_file,0 , &gerr)) {error ("Unable to load key file from %s: (%s)" , att_file, gerr->message); -g_error_free (gerr); +g_clear_error (&gerr); +g_key_file_free (att_key_file); + att_key_file =NULL ; }for (seq = recs; seq; seq = seq->next) {
@@ -5068,12 +5074,11 @@ next:if (sdp_key_file) { data =g_key_file_to_data (sdp_key_file, &length,NULL );if (length >0 ) { -create_file (sdp_file,0600 );if (!g_file_set_contents (sdp_file, data, length, &gerr)) {error ("Unable set contents for %s: (%s)" , sdp_file, gerr->message); -g_error_free (gerr); +g_clear_error (&gerr); } }
@@ -5084,12 +5089,11 @@ next:if (att_key_file) { data =g_key_file_to_data (att_key_file, &length,NULL );if (length >0 ) { -create_file (att_file,0600 );if (!g_file_set_contents (att_file, data, length, &gerr)) {error ("Unable set contents for %s: (%s)" , att_file, gerr->message); -g_error_free (gerr); +g_clear_error (&gerr); } }
Signature · 1 line
2.31.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=572167
---Test result---
Test Summary:
CheckPatch PASS 1.35 seconds GitLint PASS 0.95 seconds Prep - Setup ELL PASS 41.40 seconds Build - Prep PASS 0.46 seconds Build - Configure PASS 7.71 seconds Build - Make PASS 178.31 seconds Make Check PASS 9.05 seconds Make Distcheck PASS 212.02 seconds Build w/ext ELL - Configure PASS 7.82 seconds Build w/ext ELL - Make PASS 168.61 seconds
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerHi,
Quoted 25 lines · On Thu, Oct 28, 2021 at 2:53 PM <[email protected]> wrote:
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=572167---Test result---
Test Summary:
CheckPatch PASS 1.35 seconds GitLint PASS 0.95 seconds Prep - Setup ELL PASS 41.40 seconds Build - Prep PASS 0.46 seconds Build - Configure PASS 7.71 seconds Build - Make PASS 178.31 seconds Make Check PASS 9.05 seconds Make Distcheck PASS 212.02 seconds Build w/ext ELL - Configure PASS 7.82 seconds Build w/ext ELL - Make PASS 168.61 seconds
Quoted 3 lines
---
Regards,
Linux Bluetooth
Pushed.
Signature · 1 line
Luiz Augusto von Dentz