  
          assert(m);
  
-@@ -1565,26 +1572,26 @@
+@@ -1570,26 +1577,26 @@
          for (i = 1;; i++) {
                  int k;
  

         a->sockaddr.nl.nl_family = AF_NETLINK;
         a->sockaddr.nl.nl_groups = group;
 
Index: git/src/cryptsetup-generator.c
===================================================================
--- git.orig/src/cryptsetup-generator.c	2011-09-18 19:16:53.000000000 -0700
+++ git/src/cryptsetup-generator.c	2011-09-18 19:38:47.205597702 -0700
@@ -263,7 +263,7 @@
 
         for (;;) {
                 char line[LINE_MAX], *l;
-                char *name = NULL, *device = NULL, *password = NULL, *options = NULL;
+                char name[50], device[50], password[50], options[50] = NULL;
                 int k;
 
                 if (!(fgets(line, sizeof(line), f)))
@@ -275,7 +275,7 @@
                 if (*l == '#' || *l == 0)
                         continue;
 
-                if ((k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options)) < 2 || k > 4) {
+                if ((k = sscanf(l, "%s %s %s %s", &name, &device, &password, &options)) < 2 || k > 4) {
                         log_error("Failed to parse /etc/crypttab:%u, ignoring.", n);
                         r = EXIT_FAILURE;
                         goto next;
@@ -284,11 +284,7 @@
                 if (create_disk(name, device, password, options) < 0)
                         r = EXIT_FAILURE;
 
-        next:
-                free(name);
-                free(device);
-                free(password);
-                free(options);
+        next:;
         }
 
 finish:
Index: git/src/swap.c
===================================================================
--- git.orig/src/swap.c	2011-09-18 19:16:53.000000000 -0700
+++ git/src/swap.c	2011-09-18 19:38:47.205597702 -0700
@@ -1044,11 +1044,12 @@
         (void) fscanf(m->proc_swaps, "%*s %*s %*s %*s %*s\n");
 
         for (i = 1;; i++) {

                 if (r < 0) {
Index: git/src/socket-util.c
===================================================================
--- git.orig/src/socket-util.c	2012-01-25 21:27:23.000000000 -0800
+++ git/src/socket-util.c	2012-01-25 21:59:43.897031326 -0800
@@ -192,7 +192,7 @@
 int socket_address_parse_netlink(SocketAddress *a, const char *s) {
         int family;
