epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

avoid UB in decodeAsIPv6Address()

Browse Source 
Order of evaluation within an expression is
undefined behavior.
This commit is contained in:
Michael Davidsaver
2018-09-29 12:58:51 -07:00
parent 4e5aef3e42
commit e6902ee41f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/inetAddressUtil.cpp
View File

@@ -57,11 +57,13 @@ bool decodeAsIPv6Address(ByteBuffer* buffer, osiSockAddr* address) {
// allow all zeros address
//if (ffff != (int16)0xFFFF) return false;
uint32_t ipv4Addr =
((uint32_t)(buffer->getByte()&0xFF))<<24 |
((uint32_t)(buffer->getByte()&0xFF))<<16 |
((uint32_t)(buffer->getByte()&0xFF))<<8 |
((uint32_t)(buffer->getByte()&0xFF));
uint32 ipv4Addr = uint8(buffer->getByte());
ipv4Addr <<= 8;
ipv4Addr |= uint8(buffer->getByte());
ipv4Addr <<= 8;
ipv4Addr |= uint8(buffer->getByte());
ipv4Addr <<= 8;
ipv4Addr |= uint8(buffer->getByte());
if (ffff != (int16)0xFFFF && ipv4Addr != (uint32_t)0)
return false;