[haiku-commits] haiku: hrev46410 - src/system/kernel/vm

  • From: ingo_weinhold@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 22 Nov 2013 13:45:12 +0100 (CET)

hrev46410 adds 1 changeset to branch 'master'
old head: 4981e7764532a7e436b50fd72e3d23715fb1291a
new head: 7f6991c35e2eb0ec419468736721c5fe79789333
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7f6991c+%5E4981e77

----------------------------------------------------------------------------

7f6991c: Fixed resource leak and possible strings corruption
  
  Signed-off-by: Ingo Weinhold <ingo_weinhold@xxxxxx>

                                                 [ Ezo <ezo.dev@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46410
Commit:      7f6991c35e2eb0ec419468736721c5fe79789333
URL:         http://cgit.haiku-os.org/haiku/commit/?id=7f6991c
Author:      Ezo <ezo.dev@xxxxxxxxx>
Date:        Wed Nov 20 22:01:21 2013 UTC
Committer:   Ingo Weinhold <ingo_weinhold@xxxxxx>
Commit-Date: Fri Nov 22 12:44:10 2013 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 4 deletions(-)
src/system/kernel/vm/VMAnonymousCache.cpp | 8 ++++----

----------------------------------------------------------------------------

diff --git a/src/system/kernel/vm/VMAnonymousCache.cpp 
b/src/system/kernel/vm/VMAnonymousCache.cpp
index d0337ba..7d3c0d8 100644
--- a/src/system/kernel/vm/VMAnonymousCache.cpp
+++ b/src/system/kernel/vm/VMAnonymousCache.cpp
@@ -1484,11 +1484,11 @@ swap_init_post_modules()
                                        // User specified a size / volume that 
seems valid
                                        swapAutomatic = false;
                                        swapSize = atoll(size);
-                                       strncpy(selectedVolume.name, volume,
+                                       strlcpy(selectedVolume.name, volume,
                                                sizeof(selectedVolume.name));
-                                       strncpy(selectedVolume.device, device,
+                                       strlcpy(selectedVolume.device, device,
                                                sizeof(selectedVolume.device));
-                                       strncpy(selectedVolume.filesystem, 
filesystem,
+                                       strlcpy(selectedVolume.filesystem, 
filesystem,
                                                
sizeof(selectedVolume.filesystem));
                                        selectedVolume.capacity = 
atoll(capacity);
                                } else {
@@ -1498,8 +1498,8 @@ swap_init_post_modules()
                                                "using automatic swap\n", 
__func__);
                                }
                        }
-                       unload_driver_settings(settings);
                }
+               unload_driver_settings(settings);
        }
 
        if (swapAutomatic) {


Other related posts:

  • » [haiku-commits] haiku: hrev46410 - src/system/kernel/vm - ingo_weinhold