From 6f46f75dfc2c80b99a6a5fb277bab456a5fd247b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 3 Dec 2007 17:17:05 -0800 Subject: Make strhex_to_str clear on string limits. Remove pstring from web/*.c Jeremy. (This used to be commit f9c8d62389f8cb47837e5360209936176537df13) --- source3/lib/util_str.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'source3/lib/util_str.c') diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index a0ca03a972..7cd0f78439 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -1034,7 +1034,7 @@ static char *strncpyn(char *dest, const char *src, size_t n, char c) **/ -size_t strhex_to_str(char *p, size_t len, const char *strhex) +size_t strhex_to_str(char *buf, size_t buf_len, const char *strhex, size_t strhex_len) { size_t i; size_t num_chars = 0; @@ -1042,7 +1042,7 @@ size_t strhex_to_str(char *p, size_t len, const char *strhex) const char *hexchars = "0123456789ABCDEF"; char *p1 = NULL, *p2 = NULL; - for (i = 0; i < len && strhex[i] != 0; i++) { + for (i = 0; i < strhex_len && strhex[i] != 0; i++) { if (strnequal(hexchars, "0x", 2)) { i++; /* skip two chars */ continue; @@ -1060,7 +1060,10 @@ size_t strhex_to_str(char *p, size_t len, const char *strhex) hinybble = PTR_DIFF(p1, hexchars); lonybble = PTR_DIFF(p2, hexchars); - p[num_chars] = (hinybble << 4) | lonybble; + if (num_chars >= buf_len) { + break; + } + buf[num_chars] = (hinybble << 4) | lonybble; num_chars++; p1 = NULL; @@ -1079,8 +1082,9 @@ DATA_BLOB strhex_to_data_blob(TALLOC_CTX *mem_ctx, const char *strhex) ret_blob = data_blob(NULL, strlen(strhex)/2+1); ret_blob.length = strhex_to_str((char*)ret_blob.data, - strlen(strhex), - strhex); + ret_blob.length, + strhex, + strlen(strhex)); return ret_blob; } -- cgit