[Parted-commits] GNU Parted Official Repository: Changes to 'debian/master'

Otavio Salvador otavio at alioth.debian.org
Tue May 6 19:10:10 UTC 2008


 debian/changelog       |   18 ++++++++++++++++++
 include/parted/linux.h |    2 +-
 libparted/arch/linux.c |    2 +-
 libparted/exception.c  |    2 +-
 parted/parted.c        |    9 ++++++++-
 5 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit 612dcf5a150e58147ed794bd7552d5e1ee3be907
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue May 6 14:36:21 2008 -0300

    Release 1.8.8.git.2008.03.24-4

diff --git a/debian/changelog b/debian/changelog
index f860793..41247b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+parted (1.8.8.git.2008.03.24-4) experimental; urgency=low
+
+  [ Otavio Salvador ]
+  * properly test for __s390__ and __s390x__ macros to disable O_DIRECT
+    on that
+
+  [ Matt Davis ]
+  * Corrected a few memory leaks from unallocated ped_unit_format calls.
+  * Corrected memory leak when displaying partition flags.
+  * Corrected a small memory leak when displaying partition information
+
+  [ Otavio Salvador ]
+  * do not loop in case message exception has no message
+  * fix memory leak in exception handler
+  * Ensure that autoreconf uses aclocal 1.0
+
+ -- Otavio Salvador <otavio at ossystems.com.br>  Tue, 06 May 2008 14:35:08 -0300
+
 parted (1.8.8.git.2008.03.24-3) experimental; urgency=low
 
   [ Otavio Salvador ]

commit 14225f4040bde29973434f37b885511c1f595451
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Tue May 6 14:09:37 2008 -0300

    properly test for __s390__ and __s390x__ macros to disable O_DIRECT on that
    (cherry picked from commit b299da486b051e5737942ea00446754ab41eef27)

diff --git a/include/parted/linux.h b/include/parted/linux.h
index 52d28be..05a2f0e 100644
--- a/include/parted/linux.h
+++ b/include/parted/linux.h
@@ -22,7 +22,7 @@
 #include <parted/parted.h>
 #include <parted/device.h>
 
-#if defined __s390__ || defined __s390x__
+#if defined(__s390__) || defined(__s390x__)
 #  include <parted/fdasd.h>
 #endif
 
diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index 462ab92..6e7d010 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -64,7 +64,7 @@
 #define HDIO_GETGEO             0x0301  /* get device geometry */
 #define HDIO_GET_IDENTITY       0x030d  /* get IDE identification info */
 
-#if defined(O_DIRECT) && (!defined(__s390__) || !defined(__s390x__))
+#if defined(O_DIRECT) && !(defined(__s390__) || defined(__s390x__))
 #define RD_MODE (O_RDONLY | O_DIRECT)
 #define WR_MODE (O_WRONLY | O_DIRECT)
 #define RW_MODE (O_RDWR | O_DIRECT)

commit 529c01ca3a40d07a7417a9ffcb47b512e4658359
Author: Matt Davis <mattdavis9 at gmail.com>
Date:   Mon Apr 28 22:56:59 2008 -0400

    Corrected a few memory leaks from unallocated ped_unit_format calls.
    
    Deallocated memory in do_print() allocated by ped_unit_format calls.
    (cherry picked from commit eadcd8e418af50c7ae6eaa5a7c5d19bc26ff1efa)

diff --git a/parted/parted.c b/parted/parted.c
index f135e8b..d27a8e6 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -1490,6 +1490,9 @@ do_print (PedDevice** dev)
                     table_add_row_from_strlist (table, row);
                     str_list_destroy (row);
                     ped_free (tmp);
+                    ped_free (start);
+                    ped_free (end);
+                    ped_free (size);
             }
 
             table_rendered = table_render (table); 

commit fbc975ba97d99b11bf81794a2a19e2f38068166c
Author: Matt Davis <mattdavis9 at gmail.com>
Date:   Mon Apr 28 22:28:49 2008 -0400

    Corrected memory leak when displaying partition flags.
    
    Deallocated memory allocated by partition_print_flags()
    (cherry picked from commit fcbf070239dc590db6a2aaf9d9e3608d2ff45204)

diff --git a/parted/parted.c b/parted/parted.c
index 94d07e5..f135e8b 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -1274,6 +1274,7 @@ do_print (PedDevice** dev)
         char*           size;
         const char*     name;
         char*           tmp;
+        char*           flags;
         wchar_t*        table_rendered;
 
         disk = ped_disk_new (*dev);
@@ -1473,7 +1474,9 @@ do_print (PedDevice** dev)
                                     str_list_append (row, name);
                             }
 
-                            str_list_append (row, partition_print_flags (part));
+                            flags = partition_print_flags (part);
+                            str_list_append (row, flags);
+                            ped_free (flags);
                     } else {
                             if (has_extended)
                                     str_list_append (row, "");

commit 503ce53bc3f0fa6806479cce51228fdfd16876f8
Author: Matt Davis <mattdavis9 at gmail.com>
Date:   Sat Apr 26 20:31:39 2008 -0400

    Corrected a small memory leak when displaying partition information
    
    Deallocated a very small memory allocation that occurs in a for loop.
    This occurred during output of partition numbers.
    (cherry picked from commit b56d69cd7d0bf5ed90166e6cb701971ddfda2ab7)

diff --git a/parted/parted.c b/parted/parted.c
index 738151b..94d07e5 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -1486,6 +1486,7 @@ do_print (PedDevice** dev)
                     //PED_ASSERT (row.cols == caption.cols)
                     table_add_row_from_strlist (table, row);
                     str_list_destroy (row);
+                    ped_free (tmp);
             }
 
             table_rendered = table_render (table); 

commit 5de724f1bc7bbfa4a5c71ae0b24df90de6b73ca1
Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Thu Apr 24 17:46:28 2008 -0300

    do not loop in case message exception has no message
    
    The exception handler was looping when the exception had no message.
    (cherry picked from commit c092d19ecdd04f0805e52b7671b91678a2bb74e2)

diff --git a/libparted/exception.c b/libparted/exception.c
index 7e8fa43..94d30cd 100644
--- a/libparted/exception.c
+++ b/libparted/exception.c
@@ -243,7 +243,7 @@ ped_exception_throw (PedExceptionType ex_type,
 	ex->type = ex_type;
 	ex->options = ex_opts;
 
-	while (1) {
+	while (message) {
 			ex->message = (char*) malloc (size * sizeof (char));
 			if (!ex->message)
 					goto no_memory;



More information about the Parted-commits mailing list