File CVE-2020-25718-lib-Add-hex_byte-to-replace.h.patch of Package ldb.21699

Overview Repositories Revisions Requests Users Attributes Meta

File CVE-2020-25718-lib-Add-hex_byte-to-replace.h.patch of Package ldb.21699

From b1f118752ebf7c8eafe4df03e23fa787d5996113 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Mon, 4 Jan 2021 13:12:30 +0100
Subject: [PATCH] CVE-2020-25718 lib: Add "hex_byte()" to replace.h

This is required in quite a few places, and replace.h has things like
ZERO_STRUCT already, so this is not completely outplaced.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14558

(cherry picked from commit c8d9ce3f7c8c486ab21e320a0adcb71311dcb453)
---
 lib/replace/replace.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 6c78311f2d3..aaca9e67d3b 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -977,6 +977,22 @@ bool nss_wrapper_hosts_enabled(void);
 bool socket_wrapper_enabled(void);
 bool uid_wrapper_enabled(void);
 
+static inline bool _hexcharval(char c, uint8_t *val)
+{
+	if ((c >= '0') && (c <= '9')) { *val = c - '0';      return true; }
+	if ((c >= 'a') && (c <= 'f')) {	*val = c - 'a' + 10; return true; }
+	if ((c >= 'A') && (c <= 'F')) { *val = c - 'A' + 10; return true; }
+	return false;
+}
+
+static inline bool hex_byte(const char *in, uint8_t *out)
+{
+	uint8_t hi=0, lo=0;
+	bool ok = _hexcharval(in[0], &hi) && _hexcharval(in[1], &lo);
+	*out = (hi<<4)+lo;
+	return ok;
+}
+
 /* Needed for Solaris atomic_add_XX functions. */
 #if defined(HAVE_SYS_ATOMIC_H)
 #include <sys/atomic.h>
-- 
2.31.1

Places

File CVE-2020-25718-lib-Add-hex_byte-to-replace.h.patch of Package ldb.21699

Places