[haiku-commits] haiku: hrev44905 - in src/add-ons: input_server/methods/canna/rk kernel/file_systems/udf

  • From: stpere@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 27 Nov 2012 03:12:43 +0100 (CET)

hrev44905 adds 2 changesets to branch 'master'
old head: a8fe6dad7e41b20969c36e9babb8dc4926636db2
new head: aa18b835046dab3a7877b8cb16b006494c199b64
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=aa18b83+%5Ea8fe6da

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

6fc6cc0: Canna: incorrect strlen calculation (CID 602178).

aa18b83: udf kernel add-on: memory leak fix (CID 743820).

                                [ Philippe Saint-Pierre <stpere@xxxxxxxxx> ]

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

2 files changed, 2 insertions(+), 1 deletion(-)
src/add-ons/input_server/methods/canna/rk/dd.c            | 2 +-
src/add-ons/kernel/file_systems/udf/MetadataPartition.cpp | 1 +

############################################################################

Commit:      6fc6cc0c5715affbb8d9deb092717fdbf59a123a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=6fc6cc0
Author:      Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date:        Tue Nov 27 01:03:50 2012 UTC

Canna: incorrect strlen calculation (CID 602178).

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

diff --git a/src/add-ons/input_server/methods/canna/rk/dd.c 
b/src/add-ons/input_server/methods/canna/rk/dd.c
index 08f149f..128cd49 100644
--- a/src/add-ons/input_server/methods/canna/rk/dd.c
+++ b/src/add-ons/input_server/methods/canna/rk/dd.c
@@ -1377,7 +1377,7 @@ else if ((mode & (RK_ENABLE_WRITE | RK_DISABLE_WRITE)) == 
RK_DISABLE_WRITE) {
 }
        
        if (newflags != dd->dd_flags) {
-               dicsdir = (char *)malloc(strlen(dd->dd_path + 
strlen("/dics.dir") + 1));
+               dicsdir = (char *)malloc(strlen(dd->dd_path) + 
strlen("/dics.dir") + 1);
                if (dicsdir) {
                        int filemode;
                        

############################################################################

Revision:    hrev44905
Commit:      aa18b835046dab3a7877b8cb16b006494c199b64
URL:         http://cgit.haiku-os.org/haiku/commit/?id=aa18b83
Author:      Philippe Saint-Pierre <stpere@xxxxxxxxx>
Date:        Tue Nov 27 01:59:28 2012 UTC

udf kernel add-on: memory leak fix (CID 743820).

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

diff --git a/src/add-ons/kernel/file_systems/udf/MetadataPartition.cpp 
b/src/add-ons/kernel/file_systems/udf/MetadataPartition.cpp
index 619a6b8..2b66da5 100644
--- a/src/add-ons/kernel/file_systems/udf/MetadataPartition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/MetadataPartition.cpp
@@ -48,6 +48,7 @@ MetadataPartition::MetadataPartition(Volume *volume,
 MetadataPartition::~MetadataPartition()
 {
        delete fMetadataIcb;
+       delete fMetadataMirrorIcb;
 }
 
 /*! \brief Maps the given logical block to a physical block on disc.


Other related posts:

  • » [haiku-commits] haiku: hrev44905 - in src/add-ons: input_server/methods/canna/rk kernel/file_systems/udf - stpere