From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 19 Feb 2008 13:47:22 +0000 (+0100)
Subject: lsa.idl: strlen_m*() also for the lsa_AsciiString* versions
X-Git-Tag: samba-3.2.0pre2~37^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c445a17a91827c6c95b3a1cda9b78f5cdd41aa55;p=thirdparty%2Fsamba.git

lsa.idl: strlen_m*() also for the lsa_AsciiString* versions

We already did this before b994f899b42d294c0418bdc82660a2f7510667d6.

This is needed to handle NULL strings, where strlen() would crash...

Maybe we should add a strlen_a() and strlen_a_term() later...

metze
---

diff --git a/source/librpc/idl/lsa.idl b/source/librpc/idl/lsa.idl
index a705306fdca..ee8a2fe6b20 100644
--- a/source/librpc/idl/lsa.idl
+++ b/source/librpc/idl/lsa.idl
@@ -33,14 +33,14 @@ import "security.idl";
 	} lsa_Strings;
 
 	typedef [public] struct {
-		[value(strlen(string))] uint16 length;
-		[value(strlen(string))] uint16 size;
+		[value(strlen_m(string))] uint16 length;
+		[value(strlen_m(string))] uint16 size;
 		[charset(DOS),size_is(size),length_is(length)] uint8 *string;
 	} lsa_AsciiString;
 
 	typedef [public] struct {
-		[value(strlen(string))] uint16 length;
-		[value(strlen(string)+1)] uint16 size;
+		[value(strlen_m(string))] uint16 length;
+		[value(strlen_m_term(string))] uint16 size;
 		[charset(DOS),size_is(size),length_is(length)] uint8 *string;
 	} lsa_AsciiStringLarge;