i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix another misuse of BOpenHashTable::Iterator

Browse Source 
* This ioctl is used only in the arp command, but still we should keep
it working
* Similar to the problem in elf.cpp, this relied on entry being set to
NULL when trying to iterate after the last element.
This commit is contained in:
Adrien Destugues
2015-01-10 10:48:43 +01:00
parent 42eb787c74
commit d1644d7e4f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
+3 -5
View File
@@ -885,14 +885,12 @@ arp_control(const char *subsystem, uint32 function, void *buffer,
arp_entry *entry = NULL; arp_entry *entry = NULL;
uint32 i = 0; uint32 i = 0;
while (iterator.HasNext() && i < control.cookie) { for (uint32 i = 0; i <= control.cookie; i++) {
if (!iterator.HasNext())
return B_ENTRY_NOT_FOUND;
entry = iterator.Next(); entry = iterator.Next();
i++;
} }
if (entry == NULL)
return B_ENTRY_NOT_FOUND;
control.cookie++; control.cookie++;
control.address = entry->protocol_address; control.address = entry->protocol_address;
if (entry->hardware_address.sdl_alen == ETHER_ADDRESS_LENGTH) { if (entry->hardware_address.sdl_alen == ETHER_ADDRESS_LENGTH) {