plug two config-parsing leaks

* src/storage_conf.c (virStoragePoolDefParsePerms): Free mode string.
(virStorageVolDefParsePerms): Likewise.
* AUTHORS: Update.
Patch by Ryota Ozaki.

diff --git a/AUTHORS b/AUTHORS
index 29585df193de5588a967aa66d41f583520cefdb0..1c8700355639a908ef0715dd359f1f3af071a114 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,6 +59,7 @@ Patches have also been contributed by:
   Itamar Heim          <iheim@redhat.com>
   Dave Allan           <dallan@redhat.com>
   Markus Armbruster    <armbru@redhat.com>
+  Ryota Ozaki          <ozaki.ryota@gmail.com>
 
   [....send patches to get your name here....]
 

diff --git a/ChangeLog b/ChangeLog
index 5675b082f1272790cb41c025ec62a753c8cdd671..18bebae211fc717e3ce89ee915c90646ae975d0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 Mon Mar 2 10:16:04 +0100 2009 Jim Meyering <meyering@redhat.com>
 
+       plug two config-parsing leaks
+       * src/storage_conf.c (virStoragePoolDefParsePerms): Free mode string.
+       (virStorageVolDefParsePerms): Likewise.
+       Patch by Ryota Ozaki.
+       * AUTHORS: Update.
+
        don't dereference uninitialized pointer
        * src/storage_conf.c (virStoragePoolDefParsePerms): Initialize
        "ptr" to NULL.

diff --git a/src/storage_conf.c b/src/storage_conf.c
index 4a53ff49b5a4c1c7568f638d00e8a9b15cf69e36..46bde6f7d3ffb5d2f0f652cc6e6eeff83cd3ace3 100644 (file)
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -383,6 +383,7 @@ virStoragePoolDefParsePerms(virConnectPtr conn,
     } else {
         char *end = NULL;
         perms->mode = strtol(mode, &end, 8);
+        VIR_FREE(mode);
         if (*end || perms->mode < 0 || perms->mode > 0777) {
             virStorageReportError(conn, VIR_ERR_XML_ERROR,
                                   "%s", _("malformed octal mode"));
@@ -812,6 +813,7 @@ virStorageVolDefParsePerms(virConnectPtr conn,
     } else {
         char *end = NULL;
         perms->mode = strtol(mode, &end, 8);
+        VIR_FREE(mode);
         if (*end || perms->mode < 0 || perms->mode > 0777) {
             virStorageReportError(conn, VIR_ERR_XML_ERROR,
                                   "%s", _("malformed octal mode"));