GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-13 17:27:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Some UTF8 String Overflow Issues;

Browse Source
This commit is contained in:
lwvmobile
2025-03-13 14:45:02 -04:00
parent f593453328
commit 9f063cb4da
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dmr_pdu.c
View File

@@ -461,7 +461,9 @@ void decode_ip_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t *
{
sprintf (state->dmr_lrrp_gps[slot], " IP Call SRC: %d; Port; %d; DST: %d; Port: %d;", src24, port1, dst24, port2);
fprintf (stderr, "Unknown UDP Port;");
utf8_to_text(state, 0, len-28, input+28);
if (len > 28)
utf8_to_text(state, 0, len-28, input+28);
else utf8_to_text(state, 0, len, input+28);
}
}
@@ -470,7 +472,9 @@ void decode_ip_pdu (dsd_opts * opts, dsd_state * state, uint16_t len, uint8_t *
{
sprintf (state->dmr_lrrp_gps[slot], " IP Call SRC: %d; DST: %d; Protocol: %d;", src24, dst24, prot);
fprintf(stderr, "Unknown IP Protocol: %02X;", prot);
utf8_to_text(state, 0, len-28, input+28);
if (len > 28)
utf8_to_text(state, 0, len-28, input+28);
else utf8_to_text(state, 0, len, input+28);
}
}

7
src/p25p1_pdu_data.c
View File

@@ -254,7 +254,12 @@ void p25_decode_pdu_data(dsd_opts * opts, dsd_state * state, uint8_t * input, in
else if (sap == 48) //Tier 1 Location Service (or does it depend on the io bit?)
utf8_to_text(state, 0, len-ptr, input+ptr); //TODO, read initial string, i.e., $GPRMC and properly decode
else utf8_to_text(state, 0, len-ptr, input+ptr); //default catch all
else //default catch all
{
if (len > ptr)
utf8_to_text(state, 0, len-ptr, input+ptr);
else utf8_to_text(state, 0, len, input+ptr);
}
}
else
{