vrr/nDPId
2
0
Fork 0
mirror of https://github.com/utoni/nDPId.git synced 2026-10-18 23:40:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix proto_stack buffer bounds and rename EPAN provider variable
Some checks failed
Build OpenWrt Packages / build (armsr-armv8) (push) Has been cancelled
Details
Build OpenWrt Packages / build (malta-be) (push) Has been cancelled
Details
Build OpenWrt Packages / build (ramips-mt7621) (push) Has been cancelled
Details
Build OpenWrt Packages / build (x86-64) (push) Has been cancelled
Details

Browse source 
Agent-Logs-Url: https://github.com/utoni/nDPId/sessions/d82f4f7b-4b61-40be-bbaf-1a7a46ab7986

Co-authored-by: utoni <651384+utoni@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-05-18 06:02:38 +00:00 • committed by GitHub
parent 425a202f60
commit 5d16e969b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nDPId.c
View file

@ -5444,13 +5444,15 @@ static void jsonize_epan_dissection(struct nDPId_reader_thread * const reader_th
if (fi != NULL && fi->hfinfo != NULL && fi->hfinfo->abbrev != NULL &&
fi->hfinfo->abbrev[0] != '\0')
{
if (proto_stack_len > 0 && proto_stack_len < (int)sizeof(proto_stack) - 1)
{
proto_stack[proto_stack_len++] = ':';
}
int const abbrev_len = (int)strlen(fi->hfinfo->abbrev);
if (proto_stack_len + abbrev_len < (int)sizeof(proto_stack))
/* Need space for separator colon (if not first), abbrev, and NUL terminator. */
int const needed = (proto_stack_len > 0 ? 1 : 0) + abbrev_len + 1;
if (proto_stack_len + needed <= (int)sizeof(proto_stack))
{
if (proto_stack_len > 0)
{
proto_stack[proto_stack_len++] = ':';
}
memcpy(proto_stack + proto_stack_len, fi->hfinfo->abbrev, abbrev_len);
proto_stack_len += abbrev_len;
}
@ -6547,8 +6549,8 @@ int main(int argc, char ** argv)
logger_early(1, "%s", "Could not initialize Wireshark EPAN library.");
return 1;
}
static int epan_prov_dummy = 0;
g_epan_session = epan_new((struct packet_provider_data *)&epan_prov_dummy, &ndpid_epan_provider_funcs);
static int epan_packet_provider_ctx = 0;
g_epan_session = epan_new((struct packet_provider_data *)&epan_packet_provider_ctx, &ndpid_epan_provider_funcs);
if (g_epan_session == NULL)
{
logger_early(1, "%s", "Could not create Wireshark EPAN session.");