From b7403b23ef766ce0599d92ba6b58ac3265f30604 Mon Sep 17 00:00:00 2001 From: Olaf Flebbe Date: Thu, 12 Apr 2012 11:29:41 +0200 Subject: [PATCH] Wrong assertion/comparison: Compare value not pointer Fix bug #8859 (Wrong assertion: Checks pointer not value). (cherry picked from commit b2f728823e8976e2ce5a2e630134ae8e01d83e82) --- source3/registry/reg_parse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c index 908facabd1f..b8ad4d702e6 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++; */ -- 2.11.4.GIT