da879ec2e
Denys Vlasenko
2010-01-26
Subject
modprobe: protect against possible SEGV
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/modprobe.c+8 -6
| @@ -80,12 +80,14 @@ static int read_config(const char *path); | |
| static char *gather_options_str(char *opts, const char *append) | |
| { | |
| /* Speed-optimized. We call gather_options_str many times. */ | |
| - | if (opts == NULL) { |
| - | opts = xstrdup(append); |
| - | } else { |
| - | int optlen = strlen(opts); |
| - | opts = xrealloc(opts, optlen + strlen(append) + 2); |
| - | sprintf(opts + optlen, " %s", append); |
| + | if (append) { |
| + | if (opts == NULL) { |
| + | opts = xstrdup(append); |
| + | } else { |
| + | int optlen = strlen(opts); |
| + | opts = xrealloc(opts, optlen + strlen(append) + 2); |
| + | sprintf(opts + optlen, " %s", append); |
| + | } |
| } | |
| return opts; | |
| } | |