From afca439d19e3d9e67b127d7060df630e2218bcb2 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 18 Oct 2005 03:21:59 +0000
Subject: r11136: patches from Brian Moran for eventlogadm utility (This used
 to be commit 47b626a8f72629fd1bbabf35b68e24d202df2555)

---
 source3/registry/reg_util.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'source3/registry/reg_util.c')

diff --git a/source3/registry/reg_util.c b/source3/registry/reg_util.c
index 9fd9dba27d..40b16d0073 100644
--- a/source3/registry/reg_util.c
+++ b/source3/registry/reg_util.c
@@ -128,26 +128,28 @@ char* reg_remaining_path( const char *key )
 /**********************************************************************
 *********************************************************************/
 
-int regval_convert_multi_sz( uint16 *multi_string, size_t multi_len, char ***values )
+int regval_convert_multi_sz( uint16 *multi_string, size_t byte_len, char ***values )
 {
 	char **sz;
 	int i;
 	int num_strings = 0;
 	fstring buffer;
 	uint16 *wp;
+	size_t multi_len = byte_len / 2;
 	
-	*values = NULL;
-
 	if ( !multi_string || !values )
 		return 0;
 
+	*values = NULL;
+
 	/* just count the NULLs */
 	
-	for ( i=0; (i<multi_len-1) && !(multi_string[i]==0x0 && multi_string[i+1]==0x0); i+=2 ) {
-		if ( multi_string[i] == 0x0 )
+	for ( i=0; (i<multi_len-1) && !(multi_string[i]==0x0 && multi_string[i+1]==0x0); i++ ) {
+		/* peek ahead */
+		if ( multi_string[i+1] == 0x0 )
 			num_strings++;
 	}
-	
+
 	if ( num_strings == 0 )
 		return 0;
 	
-- 
cgit