[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  b2f7288 Wrong assertion/comparison: Compare value not pointer
      from  56b0ec0 Fix bug #8897 - winbind_krb5_locator only returns one IP address.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit b2f728823e8976e2ce5a2e630134ae8e01d83e82
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date:   Thu Apr 12 11:29:41 2012 +0200

    Wrong assertion/comparison: Compare value not pointer
    
    Fix bug #8859 (Wrong assertion: Checks pointer not value).

-----------------------------------------------------------------------

Summary of changes:
 source3/registry/reg_parse.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c
index 908faca..b8ad4d7 100644
--- a/source3/registry/reg_parse.c
+++ b/source3/registry/reg_parse.c
@@ -793,12 +793,12 @@ handle_iconv_errno(int err, const char* obuf, size_t linenum,
 	DEBUG(0, ("Illegal multibyte sequence at line %lu: %s",
 		  (long unsigned)(linenum+1), pos));
 
-	assert(ilen > 0);
+	assert((*ilen) > 0);
 	do {
 		size_t il = 1;
 		DEBUGADD(0, ("<%02x>", (unsigned char)**iptr));
 
-		if (olen > 0) {
+		if ((*olen) > 0) {
 			*(*optr)++ = '\?';
 			(*iptr)++;
 			/* Todo: parametrize, e.g. skip: *optr++ = *iptr++; */


-- 
Samba Shared Repository