You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by we...@apache.org on 2013/02/11 02:27:52 UTC
git commit: TS-1704 avoid the null pointer dereference in dns_result
Updated Branches:
refs/heads/master 012df5298 -> ee3d25f12
TS-1704 avoid the null pointer dereference in dns_result
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ee3d25f1
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ee3d25f1
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ee3d25f1
Branch: refs/heads/master
Commit: ee3d25f1221694e7e519a1b46c24f8e9f3f4e5df
Parents: 012df52
Author: Li-Wen Hsu <lw...@lwhsu.org>
Authored: Mon Feb 11 09:25:51 2013 +0800
Committer: weijin <ta...@taobao.com>
Committed: Mon Feb 11 09:25:51 2013 +0800
----------------------------------------------------------------------
CHANGES | 3 +++
iocore/dns/DNS.cc | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ee3d25f1/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 12c0f1b..b4a06af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 3.3.1
+ *) [TS-1704] null pointer dereference in dns_result
+ Author: Li-Wen Hsu <lw...@lwhsu.org>
+
*) [TS-1701] segv if header_rewrite is configured with the InkAPI and uses
PATH or QUERY conditions. Author: John Kew.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ee3d25f1/iocore/dns/DNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/DNS.cc b/iocore/dns/DNS.cc
index 021490d..a6f686d 100644
--- a/iocore/dns/DNS.cc
+++ b/iocore/dns/DNS.cc
@@ -1192,8 +1192,11 @@ dns_result(DNSHandler *h, DNSEntry *e, HostEnt *ent, bool retry) {
}
Debug("dns", "%s result for %s = %s retry %d", result, e->qname, ptr, retry);
} else {
- Debug("dns", "%s result for %s = %s af=%d retry %d",
- ent ? "SUCCESS" : "FAIL", e->qname, (ent != NULL ? ent->ent.h_name : "<not found>"), ent->ent.h_addrtype, retry);
+ if (ent) {
+ Debug("dns", "SUCCESS result for %s = %s af=%d retry %d", e->qname, ent->ent.h_name, ent->ent.h_addrtype, retry);
+ } else {
+ Debug("dns", "FAIL result for %s = <not found> retry %d", e->qname, retry);
+ }
}
}