trafficserver git commit: TS-3304: Add NULL check to ink_inet_addr() input

[so...@apache.org]

Repository: trafficserver
Updated Branches:
  refs/heads/master a3cd7abef -> f93ca30fd


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/f93ca30f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f93ca30f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f93ca30f

Branch: refs/heads/master
Commit: f93ca30fd7e67168805c8bce0dd8f72a7fc73934
Parents: a3cd7ab
Author: Phil Sorber <so...@apache.org>
Authored: Fri Jan 16 16:15:50 2015 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Jan 16 16:15:50 2015 -0700

----------------------------------------------------------------------
 CHANGES            | 2 ++
 lib/ts/ink_inet.cc | 4 ++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f93ca30f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e175ddc..8fdbc63 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.3.0
 
+  *) [TS-3304] Add NULL check to ink_inet_addr() input.
+
   *) [TS-3301] improved TLS ticket rotation support.
    Author: Bin Zeng <bz...@linkedin.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f93ca30f/lib/ts/ink_inet.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index d84fea1..4966525 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;