[1/3] trafficserver git commit: TS-3304: Add NULL check to ink_inet_addr() input

[sorber]

Repository: trafficserver
Updated Branches:
  refs/heads/4.2.x 7cf27625b -> 2e11b44b7


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

(cherry picked from commit f93ca30fd7e67168805c8bce0dd8f72a7fc73934)

Conflicts:
        CHANGES


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/dbbbbab5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dbbbbab5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dbbbbab5

Branch: refs/heads/4.2.x
Commit: dbbbbab592a536960b43634fb6663530e9d4ed2b
Parents: 7cf2762
Author: Phil Sorber <sor...@apache.org>
Authored: Fri Jan 16 16:15:50 2015 -0700
Committer: Phil Sorber <sor...@apache.org>
Committed: Wed Jan 21 14:42:03 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/dbbbbab5/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 6aefa99..a653697 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 4.2.3
 
+  *) [TS-3304] Add NULL check to ink_inet_addr() input.
+
   *) [TS-898] Remove pointless NULL check on address of array.
 
   *) [TS-2959] Fix compiler issue for MultiCache.

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