diff options
author | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-20 11:41:46 +0000 |
---|---|---|
committer | marco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2020-04-20 11:41:46 +0000 |
commit | 89bb21641911e401757e9a1a88db9db9b6b5dc5c (patch) | |
tree | ea0b6f3680b6418d4469fdf7d6868923e251c20b | |
parent | 0dc976852224b2e471515528aadf9f8752d3aca4 (diff) | |
download | fpc-89bb21641911e401757e9a1a88db9db9b6b5dc5c.tar.gz |
--- Merging r44845 into '.':
U packages/rtl-extra/src/inc/sockets.inc
--- Recording mergeinfo for merge of r44845 into '.':
U .
# revisions: 44845
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@44880 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | packages/rtl-extra/src/inc/sockets.inc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/rtl-extra/src/inc/sockets.inc b/packages/rtl-extra/src/inc/sockets.inc index d5962ce52f..442c71cf77 100644 --- a/packages/rtl-extra/src/inc/sockets.inc +++ b/packages/rtl-extra/src/inc/sockets.inc @@ -323,8 +323,13 @@ begin else Dummy:=IP; Val (Dummy,k,J); - array4int(temp.s_addr)[i]:=k; - If J<>0 then Exit; + If J<>0 then + exit; + array4int(temp.s_addr)[i]:=byte(k); + { check if after wrapping to a byte, our number is + still the same. if not, it can't be part of an IP. } + If array4int(temp.s_addr)[i]<>k then + exit; end; strtohostaddr.s_addr:=ntohl(Temp.s_addr); end; |