mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

save-git: allocate user_info members on the heap

Browse source 
subsurface_user_info() only works on Linux (linux.c),
but it doesn't allocate values on the heap.

Solve this ownership problem by always allocating
.name and .email on the heap in subsurface_user_info()
and freeing in the caller.

If subsurface_user_info() did not modify any of the
values from NULL, use default ones, but allocate them
on the heap too.

Ref #1346

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2018-07-08 00:26:24 +03:00 • committed by Dirk Hohndel
parent 2de5b95acf
commit 94d6e5d851
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/save-git.c
View file

@ -1054,16 +1054,19 @@ static int get_authorship(git_repository *repo, git_signature **authorp)
if (git_signature_default(authorp, repo) == 0)
return 0;
#endif
/* Default name information, with potential OS overrides */
struct user_info user = {
.name = "Subsurface",
.email = "subsurface-app-account@subsurface-divelog.org"
};
/* try to fetch the user info from the OS, otherwise use default values. */
struct user_info user = { .name = NULL, .email = NULL };
subsurface_user_info(&user);
if (!user.name)
user.name = strdup("Subsurface");
if (!user.email)
user.email = strdup("subsurface-app-account@subsurface-divelog.org");
/* git_signature_default() is too recent */
return git_signature_now(authorp, user.name, user.email);
int ret = git_signature_now(authorp, user.name, user.email);
free((void *)user.name);
free((void *)user.email);
return ret;
}
static void create_commit_message(struct membuffer *msg, bool create_empty)