ubports-volte/ofono-binder-plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42 from mer-hybris/jb63068

Browse Source 
Fix some memory issues in AIDL interface support
This commit is contained in:
Matti Lehtimäki
2025-01-24 15:52:01 +02:00
committed by GitHub
parent 0ad76c3528 4f6f4555f4
commit d9724f63bd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/binder_network.c
View File

@@ -1642,9 +1642,9 @@ binder_network_set_initial_attach_apn(
RadioRequest* req;
GBinderWriter writer;
if (self->interface_aidl == RADIO_AIDL_INTERFACE_NONE) {
binder_network_data_profile_init(&profile, ctx, RADIO_DATA_PROFILE_DEFAULT);
binder_network_data_profile_init(&profile, ctx, RADIO_DATA_PROFILE_DEFAULT);
if (self->interface_aidl == RADIO_AIDL_INTERFACE_NONE) {
if (iface >= RADIO_INTERFACE_1_5) {
/* setInitialAttachApn_1_4(int32 serial, DataProfileInfo profile); */
req = radio_request_new2(self->g, RADIO_REQ_SET_INITIAL_ATTACH_APN_1_5,

4
src/binder_sms.c
View File

@@ -642,11 +642,11 @@ binder_sms_gsm_message_aidl(
* interface expects an empty string for default SMSC.
*/
char* tpdu;
tpdu = g_malloc0(sizeof(char) * (tpdu_len * 2));
int smsc_len = pdu_len - tpdu_len;
gint32 initial_size;
/* PDU is sent as an ASCII hex string */
tpdu = g_malloc0(sizeof(char) * (tpdu_len * 2 + 1));
ofono_encode_hex(pdu + smsc_len, tpdu_len, tpdu);
DBG_(self, "%s", tpdu);
@@ -657,7 +657,7 @@ binder_sms_gsm_message_aidl(
gbinder_writer_append_int32(writer, -1);
gbinder_writer_append_string16_len(writer, (const char*) pdu, smsc_len);
gbinder_writer_append_string16_len(writer, tpdu, tpdu_len * 2);
gbinder_writer_append_string16_len(writer, tpdu, tpdu_len * 2 + 1);
/* Overwrite parcelable size */
gbinder_writer_overwrite_int32(writer, initial_size,