mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-25 10:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/plug-fmt-merge-msg-leak'

Browse Source 
* jc/plug-fmt-merge-msg-leak:
  fmt-merge-msg: plug small leak of commit buffer
This commit is contained in:
Junio C Hamano 2015-05-11 14:23:45 -07:00
commit 789e98df82
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/fmt-merge-msg.c
View File

@ -223,16 +223,14 @@ static void add_branch_desc(struct strbuf *out, const char *name)
#define util_as_integral(elem) ((intptr_t)((elem)->util)) #define util_as_integral(elem) ((intptr_t)((elem)->util))
static void record_person(int which, struct string_list *people, static void record_person_from_buf(int which, struct string_list *people,
struct commit *commit) const char *buffer)
{ {
const char *buffer;
char *name_buf, *name, *name_end; char *name_buf, *name, *name_end;
struct string_list_item *elem; struct string_list_item *elem;
const char *field; const char *field;
field = (which == 'a') ? "\nauthor " : "\ncommitter "; field = (which == 'a') ? "\nauthor " : "\ncommitter ";
buffer = get_commit_buffer(commit, NULL);
name = strstr(buffer, field); name = strstr(buffer, field);
if (!name) if (!name)
return; return;
@ -245,7 +243,6 @@ static void record_person(int which, struct string_list *people,
if (name_end < name) if (name_end < name)
return; return;
name_buf = xmemdupz(name, name_end - name + 1); name_buf = xmemdupz(name, name_end - name + 1);
unuse_commit_buffer(commit, buffer);
elem = string_list_lookup(people, name_buf); elem = string_list_lookup(people, name_buf);
if (!elem) { if (!elem) {
@ -256,6 +253,15 @@ static void record_person(int which, struct string_list *people,
free(name_buf); free(name_buf);
} }
static void record_person(int which, struct string_list *people,
struct commit *commit)
{
const char *buffer = get_commit_buffer(commit, NULL);
record_person_from_buf(which, people, buffer);
unuse_commit_buffer(commit, buffer);
}
static int cmp_string_list_util_as_integral(const void *a_, const void *b_) static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
{ {
const struct string_list_item *a = a_, *b = b_; const struct string_list_item *a = a_, *b = b_;