Module Name: src
Committed By: bouyer
Date: Mon May 9 19:37:30 UTC 2011
Modified Files:
src/lib/libc/resolv [netbsd-4]: res_init.c
Log Message:
Pull up following revision(s) (requested by taca in ticket #1429):
lib/libc/resolv/res_init.c: revisions 1.11, 1.12 via patch
Don't check for ext being NULL to destroy the res_state. Instead check
the option bits like we did before.
Only try free-ing a version of res if it is not supposed to be pre-inited
like before. Fixes issues with programs passing random uninitialized data
as res_state.
To generate a diff of this commit:
cvs rdiff -u -r1.8.4.3 -r1.8.4.4 src/lib/libc/resolv/res_init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/resolv/res_init.c
diff -u src/lib/libc/resolv/res_init.c:1.8.4.3 src/lib/libc/resolv/res_init.c:1.8.4.4
--- src/lib/libc/resolv/res_init.c:1.8.4.3 Sun Jan 23 21:47:51 2011
+++ src/lib/libc/resolv/res_init.c Mon May 9 19:37:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: res_init.c,v 1.8.4.3 2011/01/23 21:47:51 bouyer Exp $ */
+/* $NetBSD: res_init.c,v 1.8.4.4 2011/05/09 19:37:30 bouyer Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@@ -77,7 +77,7 @@
static const char rcsid[] = "Id: res_init.c,v 1.16.18.7 2007/07/09 01:52:58 mar
ka Exp";
#else
-__RCSID("$NetBSD: res_init.c,v 1.8.4.3 2011/01/23 21:47:51 bouyer Exp $");
+__RCSID("$NetBSD: res_init.c,v 1.8.4.4 2011/05/09 19:37:30 bouyer Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -194,8 +194,6 @@
int maxns = MAXNS;
RES_SET_H_ERRNO(statp, 0);
- if (statp->_u._ext.ext != NULL)
- res_ndestroy(statp);
if (!preinit) {
statp->retrans = RES_TIMEOUT;
