svn commit: r336220 - head/lib/libefivar

Warner Losh imp at FreeBSD.org
Thu Jul 12 16:19:18 UTC 2018


Author: imp
Date: Thu Jul 12 16:19:17 2018
New Revision: 336220
URL: https://svnweb.freebsd.org/changeset/base/336220

Log:
  Fix an obvious 'is odd' check.
  
  len % 1 is always true. Fix StrHexToBytes to do a proper odd length
  check. This was only called by DevPathFromTextGenericPath,
  ConvertFromTextVendor and DevPathFromTextMAC, which we've not had
  a need to actually use just yet.
  
  Submitted by: David Binderman
  PR: 229718

Modified:
  head/lib/libefivar/uefi-dplib.h

Modified: head/lib/libefivar/uefi-dplib.h
==============================================================================
--- head/lib/libefivar/uefi-dplib.h	Thu Jul 12 11:38:18 2018	(r336219)
+++ head/lib/libefivar/uefi-dplib.h	Thu Jul 12 16:19:17 2018	(r336220)
@@ -576,7 +576,7 @@ StrHexToBytes(const char *str, size_t len, uint8_t *bu
 	/*
 	 * Sanity check preconditions.
 	 */
-	if (buflen != len / 2 || (len % 1) == 1)
+	if (buflen != len / 2 || (len % 2) == 1)
 		return 1;
 	for (i = 0; i < len; i += 2) {
 		if (!isxdigit(str[i]) || !isxdigit(str[i + 1]))


More information about the svn-src-head mailing list