gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check for netif before use in VirtualTap - Fixes bug mentioned in ticket #85

Browse Source
This commit is contained in:
Joseph Henry
2020-11-19 10:08:31 -08:00
parent b021e82078
commit e304a89ddb
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/VirtualTap.cpp
View File

@@ -482,15 +482,19 @@ void _lwip_eth_rx(VirtualTap *tap, const MAC &from, const MAC &to, unsigned int
int err; int err;
if (Utils::ntoh(ethhdr.type) == 0x800 || Utils::ntoh(ethhdr.type) == 0x806) { if (Utils::ntoh(ethhdr.type) == 0x800 || Utils::ntoh(ethhdr.type) == 0x806) {
if ((err = ((struct netif *)tap->netif4)->input(p, (struct netif *)tap->netif4)) != ERR_OK) { if (tap->netif4) {
DEBUG_ERROR("packet input error (%d)", err); if ((err = ((struct netif *)tap->netif4)->input(p, (struct netif *)tap->netif4)) != ERR_OK) {
pbuf_free(p); DEBUG_ERROR("packet input error (%d)", err);
pbuf_free(p);
}
} }
} }
if (Utils::ntoh(ethhdr.type) == 0x86DD) { if (Utils::ntoh(ethhdr.type) == 0x86DD) {
if ((err = ((struct netif *)tap->netif6)->input(p, (struct netif *)tap->netif6)) != ERR_OK) { if (tap->netif6) {
DEBUG_ERROR("packet input error (%d)", err); if ((err = ((struct netif *)tap->netif6)->input(p, (struct netif *)tap->netif6)) != ERR_OK) {
pbuf_free(p); DEBUG_ERROR("packet input error (%d)", err);
pbuf_free(p);
}
} }
} }
} }