diff options
| author | Raimo Niskanen <[email protected]> | 2015-02-20 12:16:12 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2015-02-20 12:16:12 +0100 |
| commit | 9741d1c9cdcce08ec7a0c5c91ab6e1af781ed745 (patch) | |
| tree | dbb6122bdd88ca497d5437f0f3b1e78a5b6ae8d0 /lib/kernel/src | |
| parent | 42db5701f3cd4fc3685e7be9cd7f66f856890e0a (diff) | |
| parent | cb5e43872ee5521f75ff66560baccd5562ce93b1 (diff) | |
| download | otp-9741d1c9cdcce08ec7a0c5c91ab6e1af781ed745.tar.gz otp-9741d1c9cdcce08ec7a0c5c91ab6e1af781ed745.tar.bz2 otp-9741d1c9cdcce08ec7a0c5c91ab6e1af781ed745.zip | |
Merge branch 'raimo/infinite-loop-gethostbyname/OTP-12133' into maint
* raimo/infinite-loop-gethostbyname/OTP-12133:
Remove infinite loop in inet:gethostbyname_tm/4
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/inet.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl index 43bab8bcf0..ec2c350931 100644 --- a/lib/kernel/src/inet.erl +++ b/lib/kernel/src/inet.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2014. All Rights Reserved. +%% Copyright Ericsson AB 1997-2015. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -1070,7 +1070,7 @@ gethostbyname_tm(Name, Type, Timer, [wins|_]=Opts) -> gethostbyname_tm_native(Name, Type, Timer, Opts); gethostbyname_tm(Name, Type, Timer, [native|_]=Opts) -> gethostbyname_tm_native(Name, Type, Timer, Opts); -gethostbyname_tm(Name, Type, Timer, [_|_]=Opts) -> +gethostbyname_tm(Name, Type, Timer, [_|Opts]) -> gethostbyname_tm(Name, Type, Timer, Opts); %% Make sure we always can look up our own hostname. gethostbyname_tm(Name, Type, Timer, []) -> |