author | Lars Hjemli <hjemli@gmail.com> | 2009-08-17 07:05:13 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-17 07:26:17 (UTC) |
commit | 435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (patch) (unidiff) | |
tree | c07a9d096c99a70e78b017b5edccb1eaaffd0795 | |
parent | 8a631b1173b1abecc5a737b0e21751ddbabf9df2 (diff) | |
download | cgit-435a1da8d1c43bff2f2ccd5649ea8510eec0b2af.zip cgit-435a1da8d1c43bff2f2ccd5649ea8510eec0b2af.tar.gz cgit-435a1da8d1c43bff2f2ccd5649ea8510eec0b2af.tar.bz2 |
cgit.c: do not segfault on unexpected query-string format
The querystring_cb() function will be invoked with a NULL value when
the querystring contains a name not followed by a '='. Such a value
used to cause a segfault, which this patch fixes.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -123,24 +123,27 @@ void config_cb(const char *name, const char *value) | |||
123 | ctx.repo->module_link= xstrdup(value); | 123 | ctx.repo->module_link= xstrdup(value); |
124 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 124 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
125 | if (*value == '/') | 125 | if (*value == '/') |
126 | ctx.repo->readme = xstrdup(value); | 126 | ctx.repo->readme = xstrdup(value); |
127 | else | 127 | else |
128 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 128 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
129 | } else if (!strcmp(name, "include")) | 129 | } else if (!strcmp(name, "include")) |
130 | parse_configfile(value, config_cb); | 130 | parse_configfile(value, config_cb); |
131 | } | 131 | } |
132 | 132 | ||
133 | static void querystring_cb(const char *name, const char *value) | 133 | static void querystring_cb(const char *name, const char *value) |
134 | { | 134 | { |
135 | if (!value) | ||
136 | value = ""; | ||
137 | |||
135 | if (!strcmp(name,"r")) { | 138 | if (!strcmp(name,"r")) { |
136 | ctx.qry.repo = xstrdup(value); | 139 | ctx.qry.repo = xstrdup(value); |
137 | ctx.repo = cgit_get_repoinfo(value); | 140 | ctx.repo = cgit_get_repoinfo(value); |
138 | } else if (!strcmp(name, "p")) { | 141 | } else if (!strcmp(name, "p")) { |
139 | ctx.qry.page = xstrdup(value); | 142 | ctx.qry.page = xstrdup(value); |
140 | } else if (!strcmp(name, "url")) { | 143 | } else if (!strcmp(name, "url")) { |
141 | ctx.qry.url = xstrdup(value); | 144 | ctx.qry.url = xstrdup(value); |
142 | cgit_parse_url(value); | 145 | cgit_parse_url(value); |
143 | } else if (!strcmp(name, "qt")) { | 146 | } else if (!strcmp(name, "qt")) { |
144 | ctx.qry.grep = xstrdup(value); | 147 | ctx.qry.grep = xstrdup(value); |
145 | } else if (!strcmp(name, "q")) { | 148 | } else if (!strcmp(name, "q")) { |
146 | ctx.qry.search = xstrdup(value); | 149 | ctx.qry.search = xstrdup(value); |