picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix %c $string substitution

Browse source 
Fix udev_rules_apply_format() to give error messages for unknown
format elements and pass such elements to the output string
unmodified.

When truncating the substitution string to the length specified in the
format string, head[len] = '\0' could write outside the buffer if that
length was too large.
This commit is contained in:
Sergey Vlasov 2007-02-01 20:18:52 +01:00 committed by Kay Sievers
parent 6ff4253618
commit c0c865d466
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
udev_rules.c
View file

@ -364,6 +364,8 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
goto found;
}
}
head[0] = '$';
err("unknown format variable '%s'", head);
} else if (head[0] == '%') {
/* substitute format char */
if (head[1] == '\0')
@ -385,6 +387,8 @@ void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize)
goto found;
}
}
head[0] = '%';
err("unknown format char '%c'", tail[0]);
}
head++;
}
@ -554,7 +558,7 @@ found:
break;
}
/* possibly truncate to format-char specified length */
if (len != -1) {
if (len >= 0 && len < (int)strlen(head)) {
head[len] = '\0';
dbg("truncate to %i chars, subtitution string becomes '%s'", len, head);
}