summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--extras/usb_id/usb_id.c3
-rw-r--r--udev_rules_parse.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index f4011ee899..ab116e9d03 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -497,6 +497,3 @@ int main(int argc, char **argv)
}
exit(retval);
}
-
-
-
diff --git a/udev_rules_parse.c b/udev_rules_parse.c
index 0259268c8f..e708f35558 100644
--- a/udev_rules_parse.c
+++ b/udev_rules_parse.c
@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rules *rules, char *line)
int valid;
char *linepos;
char *attr;
+ size_t padding;
int retval;
/* get all the keys */
@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rules *rules, char *line)
/* grow buffer and add rule */
rule_size = sizeof(struct udev_rule) + rule->bufsize;
+ padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t);
+ dbg("add %zi padding bytes", padding);
+ rule_size += padding;
+ rule->bufsize += padding;
+
rules->buf = realloc(rules->buf, rules->bufsize + rule_size);
if (!rules->buf) {
err("realloc failed");