author | Lars Hjemli <hjemli@gmail.com> | 2007-01-16 17:41:01 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-01-16 17:41:01 (UTC) |
commit | 66091f934a2d064ae55095cdc5ae008b43ea60fe (patch) (unidiff) | |
tree | 3faeafcfff2b21313464d9b919cd4b76b12a5fe9 | |
parent | 5cd2bf7e7f3f3daf6107cd3a269bad78e342de70 (diff) | |
download | cgit-66091f934a2d064ae55095cdc5ae008b43ea60fe.zip cgit-66091f934a2d064ae55095cdc5ae008b43ea60fe.tar.gz cgit-66091f934a2d064ae55095cdc5ae008b43ea60fe.tar.bz2 |
Handle empty/malformed commit messages
An empty commit message would trigger a segfault in the current
cgit_parse_commit().
Also, make sure that all char-pointers are properly initialized.
-rw-r--r-- | parsing.c | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -124,68 +124,75 @@ int cgit_parse_query(char *txt, configfn fn) | |||
124 | t++; | 124 | t++; |
125 | } | 125 | } |
126 | if (t!=txt) | 126 | if (t!=txt) |
127 | (*fn)(txt, value); | 127 | (*fn)(txt, value); |
128 | return 0; | 128 | return 0; |
129 | } | 129 | } |
130 | 130 | ||
131 | char *substr(const char *head, const char *tail) | 131 | char *substr(const char *head, const char *tail) |
132 | { | 132 | { |
133 | char *buf; | 133 | char *buf; |
134 | 134 | ||
135 | buf = xmalloc(tail - head + 1); | 135 | buf = xmalloc(tail - head + 1); |
136 | strncpy(buf, head, tail - head); | 136 | strncpy(buf, head, tail - head); |
137 | buf[tail - head] = '\0'; | 137 | buf[tail - head] = '\0'; |
138 | return buf; | 138 | return buf; |
139 | } | 139 | } |
140 | 140 | ||
141 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 141 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
142 | { | 142 | { |
143 | struct commitinfo *ret; | 143 | struct commitinfo *ret; |
144 | char *p = commit->buffer, *t = commit->buffer; | 144 | char *p = commit->buffer, *t = commit->buffer; |
145 | 145 | ||
146 | ret = xmalloc(sizeof(*ret)); | 146 | ret = xmalloc(sizeof(*ret)); |
147 | ret->commit = commit; | 147 | ret->commit = commit; |
148 | ret->author = NULL; | ||
149 | ret->author_email = NULL; | ||
150 | ret->committer = NULL; | ||
151 | ret->committer_email = NULL; | ||
152 | ret->subject = NULL; | ||
153 | ret->msg = NULL; | ||
148 | 154 | ||
149 | if (strncmp(p, "tree ", 5)) | 155 | if (strncmp(p, "tree ", 5)) |
150 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 156 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
151 | else | 157 | else |
152 | p += 46; // "tree " + hex[40] + "\n" | 158 | p += 46; // "tree " + hex[40] + "\n" |
153 | 159 | ||
154 | while (!strncmp(p, "parent ", 7)) | 160 | while (!strncmp(p, "parent ", 7)) |
155 | p += 48; // "parent " + hex[40] + "\n" | 161 | p += 48; // "parent " + hex[40] + "\n" |
156 | 162 | ||
157 | if (!strncmp(p, "author ", 7)) { | 163 | if (!strncmp(p, "author ", 7)) { |
158 | p += 7; | 164 | p += 7; |
159 | t = strchr(p, '<') - 1; | 165 | t = strchr(p, '<') - 1; |
160 | ret->author = substr(p, t); | 166 | ret->author = substr(p, t); |
161 | p = t; | 167 | p = t; |
162 | t = strchr(t, '>') + 1; | 168 | t = strchr(t, '>') + 1; |
163 | ret->author_email = substr(p, t); | 169 | ret->author_email = substr(p, t); |
164 | ret->author_date = atol(++t); | 170 | ret->author_date = atol(++t); |
165 | p = strchr(t, '\n') + 1; | 171 | p = strchr(t, '\n') + 1; |
166 | } | 172 | } |
167 | 173 | ||
168 | if (!strncmp(p, "committer ", 9)) { | 174 | if (!strncmp(p, "committer ", 9)) { |
169 | p += 9; | 175 | p += 9; |
170 | t = strchr(p, '<') - 1; | 176 | t = strchr(p, '<') - 1; |
171 | ret->committer = substr(p, t); | 177 | ret->committer = substr(p, t); |
172 | p = t; | 178 | p = t; |
173 | t = strchr(t, '>') + 1; | 179 | t = strchr(t, '>') + 1; |
174 | ret->committer_email = substr(p, t); | 180 | ret->committer_email = substr(p, t); |
175 | ret->committer_date = atol(++t); | 181 | ret->committer_date = atol(++t); |
176 | p = strchr(t, '\n') + 1; | 182 | p = strchr(t, '\n') + 1; |
177 | } | 183 | } |
178 | 184 | ||
179 | while (*p == '\n') | 185 | while (*p == '\n') |
180 | p = strchr(p, '\n') + 1; | 186 | p = strchr(p, '\n') + 1; |
181 | 187 | ||
182 | t = strchr(p, '\n'); | 188 | t = strchr(p, '\n'); |
183 | ret->subject = substr(p, t); | 189 | if (t && *t) { |
184 | p = t + 1; | 190 | ret->subject = substr(p, t); |
185 | 191 | p = t + 1; | |
186 | while (*p == '\n') | ||
187 | p = strchr(p, '\n') + 1; | ||
188 | ret->msg = p; | ||
189 | 192 | ||
193 | while (*p == '\n') | ||
194 | p = strchr(p, '\n') + 1; | ||
195 | ret->msg = p; | ||
196 | } | ||
190 | return ret; | 197 | return ret; |
191 | } | 198 | } |