svn commit: r300286 - stable/10/lib/libc/resolv

[Don Lewis]

Author: truckman
Date: Fri May 20 07:18:33 2016
New Revision: 300286
URL: https://svnweb.freebsd.org/changeset/base/300286

Log:
  MFC r299879, r299880
  
  r299879 | truckman | 2016-05-15 18:30:32 -0700 (Sun, 15 May 2016) | 7 lines
  
  Likely a false positive ... but make sure that -1 can't be used as an
  array index by splitting up a test.
  
  r299880 | truckman | 2016-05-15 18:38:24 -0700 (Sun, 15 May 2016) | 8 lines
  
  Since rdata is only used as an argument to the immediately following
  call to res_nopt_rdata(), revert r299879 and fix CID 603941 by moving
  	rdata = &buf[n];
  inside the if block.
  
  Reported by:	Coverity
  CID:		603941

Modified:
  stable/10/lib/libc/resolv/res_query.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/resolv/res_query.c
==============================================================================
--- stable/10/lib/libc/resolv/res_query.c	Fri May 20 07:14:03 2016	(r300285)
+++ stable/10/lib/libc/resolv/res_query.c	Fri May 20 07:18:33 2016	(r300286)
@@ -136,8 +136,8 @@ again:
 	if (n > 0 && (statp->_flags & RES_F_EDNS0ERR) == 0 &&
 	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC|RES_NSID))) {
 		n = res_nopt(statp, n, buf, sizeof(buf), anslen);
-		rdata = &buf[n];
 		if (n > 0 && (statp->options & RES_NSID) != 0U) {
+			rdata = &buf[n];
 			n = res_nopt_rdata(statp, n, buf, sizeof(buf), rdata,
 					   NS_OPT_NSID, 0, NULL);
 		}