From 7a1fce2101b03d89753e684e0f7c8d4e2a18d8f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 9 Feb 2006 11:10:40 +0000 Subject: [PATCH] add a zero at the end of the name string fix bug #127 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16306 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/expander/ExpanderSettings.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/apps/expander/ExpanderSettings.cpp b/src/apps/expander/ExpanderSettings.cpp index a043ad6a30..79e9fd2950 100644 --- a/src/apps/expander/ExpanderSettings.cpp +++ b/src/apps/expander/ExpanderSettings.cpp @@ -91,7 +91,7 @@ ExpanderSettings::ExpanderSettings() && (file.Read(&ref.device, sizeof(ref.device)) == sizeof(ref.device)) && (file.Read(&ref.directory, sizeof(ref.directory)) == sizeof(ref.directory)) && (file.Read(&name_size, sizeof(name_size)) == sizeof(name_size)) - && ((name_size <= 0) || (ref.name = (char*)malloc(name_size))) + && ((name_size <= 0) || (ref.name = (char*)malloc(name_size+1))) && (file.Read(ref.name, name_size) == name_size) && (file.Read(&open_destination_folder, sizeof(open_destination_folder)) == sizeof(open_destination_folder)) && (file.Read(&show_contents_listing, sizeof(show_contents_listing)) == sizeof(show_contents_listing)) @@ -107,6 +107,8 @@ ExpanderSettings::ExpanderSettings() fMessage.ReplaceBool("close_when_done", close_when_done); if(destination_folder == 0x66 || destination_folder == 0x63 || destination_folder == 0x65) fMessage.ReplaceInt8("destination_folder", destination_folder); + if (name_size > 0) + ref.name[name_size] = '\0'; BEntry entry(&ref); if(entry.Exists()) fMessage.ReplaceRef("destination_folder_use", &ref);