diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 08:59:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 08:59:34 +0200 |
| commit | 71c848bb28a2fcef918178f286f7e43d9804588d (patch) | |
| tree | 3dce8d79ffa6e3cd81d9076afb59d9b3a878c93c /gettext.c | |
| parent | Merge branch 'js/colored-push-errors' (diff) | |
| parent | Avoid multiple PREFIX definitions (diff) | |
| download | git-71c848bb28a2fcef918178f286f7e43d9804588d.tar.xz git-71c848bb28a2fcef918178f286f7e43d9804588d.zip | |
Merge branch 'js/runtime-prefix'
* js/runtime-prefix:
Avoid multiple PREFIX definitions
git_setup_gettext: plug memory leak
gettext: avoid initialization if the locale dir is not present
Diffstat (limited to 'gettext.c')
| -rw-r--r-- | gettext.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -159,15 +159,23 @@ static void init_gettext_charset(const char *domain) void git_setup_gettext(void) { const char *podir = getenv(GIT_TEXT_DOMAIN_DIR_ENVIRONMENT); + char *p = NULL; if (!podir) - podir = system_path(GIT_LOCALE_PATH); + podir = p = system_path(GIT_LOCALE_PATH); + + if (!is_directory(podir)) { + free(p); + return; + } bindtextdomain("git", podir); setlocale(LC_MESSAGES, ""); setlocale(LC_TIME, ""); init_gettext_charset("git"); textdomain("git"); + + free(p); } /* return the number of columns of string 's' in current locale */ |