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
@@ -221,56 +221,56 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) | |||
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; |