author | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 11:55:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-27 11:55:44 (UTC) |
commit | 0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2 (patch) (unidiff) | |
tree | 251b7d213cf6e6b7e0427da9613e10c8b85d5e48 | |
parent | b4d4a25aa481aa3ac8ad69df4dfa53eaa5de6173 (diff) | |
parent | c61360fea0357672d2ab84a2c5a41ae1569f5d8a (diff) | |
download | cgit-0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2.zip cgit-0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2.tar.gz cgit-0c8dd9c4bcc7a1a7a49f4eca1f3eb869d0995ea2.tar.bz2 |
Merge branch 'stable'
* stable:
cgit_parse_commit(): Add missing call to xstrdup()
-rw-r--r-- | parsing.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -149,159 +149,159 @@ void cgit_parse_url(const char *url) | |||
149 | 149 | ||
150 | cgit_repo = cgit_get_repoinfo(url); | 150 | cgit_repo = cgit_get_repoinfo(url); |
151 | if (cgit_repo) { | 151 | if (cgit_repo) { |
152 | cgit_query_repo = cgit_repo->url; | 152 | cgit_query_repo = cgit_repo->url; |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | 155 | ||
156 | cmd = strchr(url, '/'); | 156 | cmd = strchr(url, '/'); |
157 | while (!cgit_repo && cmd) { | 157 | while (!cgit_repo && cmd) { |
158 | cmd[0] = '\0'; | 158 | cmd[0] = '\0'; |
159 | cgit_repo = cgit_get_repoinfo(url); | 159 | cgit_repo = cgit_get_repoinfo(url); |
160 | if (cgit_repo == NULL) { | 160 | if (cgit_repo == NULL) { |
161 | cmd[0] = '/'; | 161 | cmd[0] = '/'; |
162 | cmd = strchr(cmd + 1, '/'); | 162 | cmd = strchr(cmd + 1, '/'); |
163 | continue; | 163 | continue; |
164 | } | 164 | } |
165 | 165 | ||
166 | cgit_query_repo = cgit_repo->url; | 166 | cgit_query_repo = cgit_repo->url; |
167 | p = strchr(cmd + 1, '/'); | 167 | p = strchr(cmd + 1, '/'); |
168 | if (p) { | 168 | if (p) { |
169 | p[0] = '\0'; | 169 | p[0] = '\0'; |
170 | if (p[1]) | 170 | if (p[1]) |
171 | cgit_query_path = trim_end(p + 1, '/'); | 171 | cgit_query_path = trim_end(p + 1, '/'); |
172 | } | 172 | } |
173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); | 173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); |
174 | cgit_query_page = xstrdup(cmd + 1); | 174 | cgit_query_page = xstrdup(cmd + 1); |
175 | return; | 175 | return; |
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | char *substr(const char *head, const char *tail) | 179 | char *substr(const char *head, const char *tail) |
180 | { | 180 | { |
181 | char *buf; | 181 | char *buf; |
182 | 182 | ||
183 | buf = xmalloc(tail - head + 1); | 183 | buf = xmalloc(tail - head + 1); |
184 | strncpy(buf, head, tail - head); | 184 | strncpy(buf, head, tail - head); |
185 | buf[tail - head] = '\0'; | 185 | buf[tail - head] = '\0'; |
186 | return buf; | 186 | return buf; |
187 | } | 187 | } |
188 | 188 | ||
189 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 189 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
190 | { | 190 | { |
191 | struct commitinfo *ret; | 191 | struct commitinfo *ret; |
192 | char *p = commit->buffer, *t = commit->buffer; | 192 | char *p = commit->buffer, *t = commit->buffer; |
193 | 193 | ||
194 | ret = xmalloc(sizeof(*ret)); | 194 | ret = xmalloc(sizeof(*ret)); |
195 | ret->commit = commit; | 195 | ret->commit = commit; |
196 | ret->author = NULL; | 196 | ret->author = NULL; |
197 | ret->author_email = NULL; | 197 | ret->author_email = NULL; |
198 | ret->committer = NULL; | 198 | ret->committer = NULL; |
199 | ret->committer_email = NULL; | 199 | ret->committer_email = NULL; |
200 | ret->subject = NULL; | 200 | ret->subject = NULL; |
201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
202 | 202 | ||
203 | if (p == NULL) | 203 | if (p == NULL) |
204 | return ret; | 204 | return ret; |
205 | 205 | ||
206 | if (strncmp(p, "tree ", 5)) | 206 | if (strncmp(p, "tree ", 5)) |
207 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 207 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
208 | else | 208 | else |
209 | p += 46; // "tree " + hex[40] + "\n" | 209 | p += 46; // "tree " + hex[40] + "\n" |
210 | 210 | ||
211 | while (!strncmp(p, "parent ", 7)) | 211 | while (!strncmp(p, "parent ", 7)) |
212 | p += 48; // "parent " + hex[40] + "\n" | 212 | p += 48; // "parent " + hex[40] + "\n" |
213 | 213 | ||
214 | if (!strncmp(p, "author ", 7)) { | 214 | if (!strncmp(p, "author ", 7)) { |
215 | p += 7; | 215 | p += 7; |
216 | t = strchr(p, '<') - 1; | 216 | t = strchr(p, '<') - 1; |
217 | ret->author = substr(p, t); | 217 | ret->author = substr(p, t); |
218 | p = t; | 218 | p = t; |
219 | t = strchr(t, '>') + 1; | 219 | t = strchr(t, '>') + 1; |
220 | ret->author_email = substr(p, t); | 220 | ret->author_email = substr(p, t); |
221 | ret->author_date = atol(++t); | 221 | ret->author_date = atol(++t); |
222 | p = strchr(t, '\n') + 1; | 222 | p = strchr(t, '\n') + 1; |
223 | } | 223 | } |
224 | 224 | ||
225 | if (!strncmp(p, "committer ", 9)) { | 225 | if (!strncmp(p, "committer ", 9)) { |
226 | p += 9; | 226 | p += 9; |
227 | t = strchr(p, '<') - 1; | 227 | t = strchr(p, '<') - 1; |
228 | ret->committer = substr(p, t); | 228 | ret->committer = substr(p, t); |
229 | p = t; | 229 | p = t; |
230 | t = strchr(t, '>') + 1; | 230 | t = strchr(t, '>') + 1; |
231 | ret->committer_email = substr(p, t); | 231 | ret->committer_email = substr(p, t); |
232 | ret->committer_date = atol(++t); | 232 | ret->committer_date = atol(++t); |
233 | p = strchr(t, '\n') + 1; | 233 | p = strchr(t, '\n') + 1; |
234 | } | 234 | } |
235 | 235 | ||
236 | while (*p && (*p != '\n')) | 236 | while (*p && (*p != '\n')) |
237 | p = strchr(p, '\n') + 1; // skip unknown header fields | 237 | p = strchr(p, '\n') + 1; // skip unknown header fields |
238 | 238 | ||
239 | while (*p == '\n') | 239 | while (*p == '\n') |
240 | p = strchr(p, '\n') + 1; | 240 | p = strchr(p, '\n') + 1; |
241 | 241 | ||
242 | t = strchr(p, '\n'); | 242 | t = strchr(p, '\n'); |
243 | if (t) { | 243 | if (t) { |
244 | if (*t == '\0') | 244 | if (*t == '\0') |
245 | ret->subject = strdup("** empty **"); | 245 | ret->subject = "** empty **"; |
246 | else | 246 | else |
247 | ret->subject = substr(p, t); | 247 | ret->subject = substr(p, t); |
248 | p = t + 1; | 248 | p = t + 1; |
249 | 249 | ||
250 | while (*p == '\n') | 250 | while (*p == '\n') |
251 | p = strchr(p, '\n') + 1; | 251 | p = strchr(p, '\n') + 1; |
252 | ret->msg = p; | 252 | ret->msg = xstrdup(p); |
253 | } else | 253 | } else |
254 | ret->subject = substr(p, p+strlen(p)); | 254 | ret->subject = substr(p, p+strlen(p)); |
255 | 255 | ||
256 | return ret; | 256 | return ret; |
257 | } | 257 | } |
258 | 258 | ||
259 | 259 | ||
260 | struct taginfo *cgit_parse_tag(struct tag *tag) | 260 | struct taginfo *cgit_parse_tag(struct tag *tag) |
261 | { | 261 | { |
262 | void *data; | 262 | void *data; |
263 | enum object_type type; | 263 | enum object_type type; |
264 | unsigned long size; | 264 | unsigned long size; |
265 | char *p, *t; | 265 | char *p, *t; |
266 | struct taginfo *ret; | 266 | struct taginfo *ret; |
267 | 267 | ||
268 | data = read_sha1_file(tag->object.sha1, &type, &size); | 268 | data = read_sha1_file(tag->object.sha1, &type, &size); |
269 | if (!data || type != OBJ_TAG) { | 269 | if (!data || type != OBJ_TAG) { |
270 | free(data); | 270 | free(data); |
271 | return 0; | 271 | return 0; |
272 | } | 272 | } |
273 | 273 | ||
274 | ret = xmalloc(sizeof(*ret)); | 274 | ret = xmalloc(sizeof(*ret)); |
275 | ret->tagger = NULL; | 275 | ret->tagger = NULL; |
276 | ret->tagger_email = NULL; | 276 | ret->tagger_email = NULL; |
277 | ret->tagger_date = 0; | 277 | ret->tagger_date = 0; |
278 | ret->msg = NULL; | 278 | ret->msg = NULL; |
279 | 279 | ||
280 | p = data; | 280 | p = data; |
281 | 281 | ||
282 | while (p && *p) { | 282 | while (p && *p) { |
283 | if (*p == '\n') | 283 | if (*p == '\n') |
284 | break; | 284 | break; |
285 | 285 | ||
286 | if (!strncmp(p, "tagger ", 7)) { | 286 | if (!strncmp(p, "tagger ", 7)) { |
287 | p += 7; | 287 | p += 7; |
288 | t = strchr(p, '<') - 1; | 288 | t = strchr(p, '<') - 1; |
289 | ret->tagger = substr(p, t); | 289 | ret->tagger = substr(p, t); |
290 | p = t; | 290 | p = t; |
291 | t = strchr(t, '>') + 1; | 291 | t = strchr(t, '>') + 1; |
292 | ret->tagger_email = substr(p, t); | 292 | ret->tagger_email = substr(p, t); |
293 | ret->tagger_date = atol(++t); | 293 | ret->tagger_date = atol(++t); |
294 | } | 294 | } |
295 | p = strchr(p, '\n') + 1; | 295 | p = strchr(p, '\n') + 1; |
296 | } | 296 | } |
297 | 297 | ||
298 | while (p && *p && (*p != '\n')) | 298 | while (p && *p && (*p != '\n')) |
299 | p = strchr(p, '\n') + 1; // skip unknown tag fields | 299 | p = strchr(p, '\n') + 1; // skip unknown tag fields |
300 | 300 | ||
301 | while (p && (*p == '\n')) | 301 | while (p && (*p == '\n')) |
302 | p = strchr(p, '\n') + 1; | 302 | p = strchr(p, '\n') + 1; |
303 | if (p && *p) | 303 | if (p && *p) |
304 | ret->msg = xstrdup(p); | 304 | ret->msg = xstrdup(p); |
305 | free(data); | 305 | free(data); |
306 | return ret; | 306 | return ret; |
307 | } | 307 | } |