commit 361adc80b79d2fca89f9c63e84782cbbbe10ac34
author Huw D M Davies <h.davies1@physics.ox.ac.uk> Fri Mar 24 19:46:30 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Mar 24 19:46:30 2000 +0000
tree 61eda627cf99c1a8a773a4f8996aee15711eb15f
parent c18f62940d53a35de8bd03c573e839e2ec5e2ef0

Ensure that non-NULL terminated stings are saved correctly.

server/registry.c

diff --git a/server/registry.c b/server/registry.c
index f2d1339..00b9ae5 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -1285,10 +1285,10 @@
 }
 
 /* dump a string to a registry save file in the old v1 format */
-static void save_string_v1( LPCWSTR str, FILE *f )
+static void save_string_v1( LPCWSTR str, FILE *f, int len )
 {
     if (!str) return;
-    while (*str)
+    while ((len == -1) ? *str : (*str && len--))
     {
         if ((*str > 0x7f) || (*str == '\n') || (*str == '='))
             fprintf( f, "\\u%04x", *str );
@@ -1312,10 +1312,10 @@
     {
         struct key_value *value = &key->values[i];
         for (j = nesting; j > 0; j --) fputc( '\t', f );
-        save_string_v1( value->name, f );
+        save_string_v1( value->name, f, -1 );
         fprintf( f, "=%d,%d,", value->type, 0 );
         if (value->type == REG_SZ || value->type == REG_EXPAND_SZ)
-            save_string_v1( (LPWSTR)value->data, f );
+            save_string_v1( (LPWSTR)value->data, f, value->len / 2 );
         else
             for (j = 0; j < value->len; j++)
                 fprintf( f, "%02x", *((unsigned char *)value->data + j) );
@@ -1324,7 +1324,7 @@
     for (i = 0; i <= key->last_subkey; i++)
     {
         for (j = nesting; j > 0; j --) fputc( '\t', f );
-        save_string_v1( key->subkeys[i]->name, f );
+        save_string_v1( key->subkeys[i]->name, f, -1 );
         fputc( '\n', f );
         save_subkeys_v1( key->subkeys[i], nesting + 1, f );
     }