Re: Alleged bug in resolver code

["H . J . Lu" <hjl at lucon dot org>]

On Sat, Jul 15, 2000 at 03:12:49AM +0200, Mark Kettenis wrote:
>    Date: Fri, 14 Jul 2000 17:57:17 -0700
>    From: "H . J . Lu" <hjl@lucon.org>
> 
>    I don't like RedHat bug report either :-). I think people from Red Hat
>    are on this mailing list. In any case, I don't have any problems to
>    back out those 2 patches as long as you send me your patch on pump.
> 
> Replacing
> 
>   res_close ();
> 
> with
> 
>   if (_res.options & RES_INIT)
>     res_close ();
> 

How about this patch instead? If res_nclose is not supposed to be
called without initialization, this patch shouldn't break anything.


H.J.
--
2000-07-14  H.J. Lu  <hjl@gnu.org>

	* resolv/res_send.c (res_nclose): Return if not initialized.

Index: resolv/res_send.c
===================================================================
RCS file: /work/cvs/gnu/glibc/resolv/res_send.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 res_send.c
--- resolv/res_send.c	2000/05/21 21:11:24	1.1.1.1
+++ resolv/res_send.c	2000/07/15 03:41:40
@@ -924,7 +924,7 @@ res_nsend(res_state statp,
  */
 void
 res_nclose(res_state statp) {
-	if (statp->_sock >= 0) {
+	if ((statp->options & RES_INIT) && statp->_sock >= 0) {
 		(void) close(statp->_sock);
 		statp->_sock = -1;
 		statp->_flags &= ~(RES_F_VC | RES_F_CONN);