You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/02/20 06:55:25 UTC
[3/3] trafficserver git commit: TS-3304: Add NULL check to
ink_inet_addr() input
TS-3304: Add NULL check to ink_inet_addr() input
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b7542846
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b7542846
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b7542846
Branch: refs/heads/5.2.x
Commit: b75428460f515f302fdff5aa79ceba5a206586ae
Parents: b490a3c
Author: Phil Sorber <so...@apache.org>
Authored: Fri Jan 16 16:15:50 2015 -0700
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Thu Feb 19 21:10:00 2015 -0800
----------------------------------------------------------------------
CHANGES | 2 ++
lib/ts/ink_inet.cc | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7542846/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index bdf2cd7..264dbe5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ Changes with Apache Traffic Server 5.2.1
*) [TS-3359] Use after free: Tunnel destroyed without updating HttpSM.
+ *) [TS-3304] Add NULL check to ink_inet_addr() input.
+
*) [TS-3355] Fix compiler warning on CentOS5.
*) [TS-3316] Fix the build for 32 bit architectures.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b7542846/lib/ts/ink_inet.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index a841a76..e920240 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -97,6 +97,10 @@ ink_inet_addr(const char *s)
int n = 0;
uint32_t base = 10;
+ if (NULL == s) {
+ return htonl((uint32_t) - 1);
+ }
+
while (n < 4) {
u[n] = 0;