server: Write terminating '\0' in the strings.

I have an application that creates its special registry key using NtCreateKey(parent, "Something\0"), and then expects to be able to open this key with NtOpenKey("Something\0") on start up. Currently this fails because terminating '\0' in the key name doesn't survive saving/loading the registry. parse_strW() helper already supports loading such key names. As the tests show after creating a kernel object with the name "Something\0" it's possible to only open it as "Something\0", and an attempt opening it as "Something" fails with STATUS_OBJECT_NAME_NOT_FOUND, and vice versa. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>

server: Write terminating '\0' in the strings.
d289dfc2 · Dmitry Timoshkov · Alexandre Julliard · 1b987bfd · d289dfc2 · d289dfc2
Commit d289dfc2 authored Jul 28, 2022 by Dmitry Timoshkov Committed by Alexandre Julliard Sep 12, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

registry.c server/registry.c +1 -1

unicode.c server/unicode.c +0 -1

No files found.
--- a/server/registry.c
+++ b/server/registry.c
@@ -256,7 +256,7 @@ static void dump_value( const struct key_value *value, FILE *f )
        if (((WCHAR *)value->data)[value->len / sizeof(WCHAR) - 1]) break;
        if (value->type != REG_SZ) fprintf( f, "str(%x):", value->type );
        fputc( '\"', f );
-        dump_strW( (WCHAR *)value->data, value->len, f, "\"\"" );
+        dump_strW( (WCHAR *)value->data, value->len - sizeof(WCHAR), f, "\"\"" );
        fprintf( f, "\"\n" );
        return;


--- a/server/unicode.c
+++ b/server/unicode.c
@@ -219,7 +219,6 @@ int dump_strW( const WCHAR *str, data_size_t len, FILE *f, const char escape[2] 
        }
        if (*str < 32)  /* octal or C escape */
        {
-            if (!*str && len == 1) continue;  /* do not output terminating NULL */
            if (escapes[*str] != '.')
                pos += sprintf( pos, "\\%c", escapes[*str] );
            else if (len > 1 && str[1] >= '0' && str[1] <= '7')