Fix two mem leaks in crypt_init_by_name_and_header().
authorMilan Broz <gmazyland@gmail.com>
Mon, 22 Aug 2011 21:53:48 +0000 (21:53 +0000)
committerMilan Broz <gmazyland@gmail.com>
Mon, 22 Aug 2011 21:53:48 +0000 (21:53 +0000)
(Thanks to okozina@redhat.com)

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@601 36d66b0a-2a48-0410-832c-cd162a569da5

lib/setup.c

index e91bf49..1e5b5ae 100644 (file)
@@ -636,7 +636,6 @@ int crypt_init_by_name_and_header(struct crypt_device **cd,
        }
 
        if (isPLAIN((*cd)->type)) {
-               (*cd)->type = strdup(CRYPT_PLAIN);
                (*cd)->plain_uuid = strdup(dmd.uuid);
                (*cd)->plain_hdr.hash = NULL; /* no way to get this */
                (*cd)->plain_hdr.offset = dmd.offset;
@@ -648,7 +647,6 @@ int crypt_init_by_name_and_header(struct crypt_device **cd,
                        (*cd)->plain_cipher_mode = strdup(cipher_mode);
                }
        } else if (isLOOPAES((*cd)->type)) {
-               (*cd)->type = strdup(CRYPT_LOOPAES);
                (*cd)->loopaes_uuid = strdup(dmd.uuid);
                (*cd)->loopaes_hdr.offset = dmd.offset;