From 45d7d6a4e19d0ac844bfc52d87a8feecfb592291 Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Mon, 25 Feb 2008 14:57:23 -0600 Subject: [PATCH] msi: Fix skipping a NULL record. --- dlls/msi/format.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 128f159da4a..8c5b246a095 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -544,6 +544,10 @@ static FORMSTR *format_replace(FORMAT *format, BOOL propfound, BOOL nonprop, format->deformatted = str; format->len = size - 1; + /* don't reformat the NULL */ + if (replace && !*replace) + format->n++; + if (!replace) return NULL; @@ -727,9 +731,6 @@ static UINT replace_stack(FORMAT *format, STACK *stack, STACK *values) msi_free(replaced); format->n = beg->n + beg->len; - if (type == FORMAT_PROPNULL) - format->n++; - top = stack_peek(stack); if (top) {