dbus-marshal-validate: Check brackets in signature nest correctly

[platform/upstream/dbus.git] / dbus / dbus-file-win.c

diff --git a/dbus/dbus-file-win.c b/dbus/dbus-file-win.c
index 06a8ea1..bdd0dcf 100644 (file)
--- a/dbus/dbus-file-win.c
+++ b/dbus/dbus-file-win.c
@@ -73,7 +73,7 @@ _dbus_file_read (HANDLE            hnd,
     {
       char *emsg = _dbus_win_error_string (GetLastError ());
       dbus_set_error (error, _dbus_win_error_from_last_error (),
-                      "Failed to read from 0x%x: %s", hnd, emsg);
+                      "Failed to read from %p: %s", hnd, emsg);
       _dbus_win_free_error_string (emsg);
       return -1;
     }
@@ -251,9 +251,9 @@ _dbus_string_save_to_file (const DBusString *str,
     }
 
 #define N_TMP_FILENAME_RANDOM_BYTES 8
-  if (!_dbus_generate_random_ascii (&tmp_filename, N_TMP_FILENAME_RANDOM_BYTES))
+  if (!_dbus_generate_random_ascii (&tmp_filename, N_TMP_FILENAME_RANDOM_BYTES,
+                                    error))
     {
-      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
       _dbus_string_free (&tmp_filename);
       return FALSE;
     }