summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-26 00:06:48 +1100
committerDamien Miller <djm@mindrot.org>2006-03-26 00:06:48 +1100
commit5996294a954e3013ade0719f3c0c7389d3d333f7 (patch)
treedd6a35f91940cb2774d1d6d90d227131eb9350bf
parent1345e617da1cdf8c62db7c372e2cd5762cb31f7f (diff)
- deraadt@cvs.openbsd.org 2006/03/20 18:41:43
[dns.c] cast xstrdup to propert u_char *
-rw-r--r--ChangeLog5
-rw-r--r--dns.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 559639b89..f7dceae92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@
50 - deraadt@cvs.openbsd.org 2006/03/20 18:26:55 50 - deraadt@cvs.openbsd.org 2006/03/20 18:26:55
51 [session.h] 51 [session.h]
52 annoying spacing fixes getting in the way of real diffs 52 annoying spacing fixes getting in the way of real diffs
53 - deraadt@cvs.openbsd.org 2006/03/20 18:41:43
54 [dns.c]
55 cast xstrdup to propert u_char *
53 56
5420060318 5720060318
55 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via 58 - (djm) [auth-pam.c] Fix memleak in error path, from Coverity via
@@ -4242,4 +4245,4 @@
4242 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4245 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4243 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4246 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4244 4247
4245$Id: ChangeLog,v 1.4238 2006/03/25 13:06:32 djm Exp $ 4248$Id: ChangeLog,v 1.4239 2006/03/25 13:06:48 djm Exp $
diff --git a/dns.c b/dns.c
index e9270798d..83d4d895a 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.c,v 1.17 2006/03/19 18:51:18 deraadt Exp $ */ 1/* $OpenBSD: dns.c,v 1.18 2006/03/20 18:41:43 deraadt Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -121,7 +121,7 @@ dns_read_rdata(u_int8_t *algorithm, u_int8_t *digest_type,
121 *digest = (u_char *) xmalloc(*digest_len); 121 *digest = (u_char *) xmalloc(*digest_len);
122 memcpy(*digest, rdata + 2, *digest_len); 122 memcpy(*digest, rdata + 2, *digest_len);
123 } else { 123 } else {
124 *digest = xstrdup(""); 124 *digest = (u_char *)xstrdup("");
125 } 125 }
126 126
127 success = 1; 127 success = 1;