[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/osl
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 25 15:09:40 UTC 2019
sal/osl/unx/nlsupport.c | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 2a8c9c8197a8ca209ba42aa95fce0b0736ae41f1
Author: Jim Jagielski <jim at apache.org>
AuthorDate: Fri Jan 25 13:42:54 2019 +0000
Commit: Jim Jagielski <jim at apache.org>
CommitDate: Fri Jan 25 13:42:54 2019 +0000
save some cycles
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 4832e1874b5c..dc640a38ce7c 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -883,7 +883,8 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
slen = strlen( "/usr/local/bin" ) + 1;
if ( opath != NULL )
slen += strlen( ":" ) + strlen( opath );
- npath = calloc( slen );
+ npath = malloc( slen );
+ *npath = '\0';
if ( opath != NULL ) {
strcat( npath, opath );
strcat( npath, ":" );
commit 004f5594fb4f54494eab3991c34c43c70a9521d7
Author: Jim Jagielski <jim at apache.org>
AuthorDate: Fri Jan 25 13:17:40 2019 +0000
Commit: Jim Jagielski <jim at apache.org>
CommitDate: Fri Jan 25 13:17:40 2019 +0000
ensure NULL
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 0f3dd7f17747..4832e1874b5c 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -883,7 +883,7 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
slen = strlen( "/usr/local/bin" ) + 1;
if ( opath != NULL )
slen += strlen( ":" ) + strlen( opath );
- npath = malloc( slen );
+ npath = calloc( slen );
if ( opath != NULL ) {
strcat( npath, opath );
strcat( npath, ":" );
More information about the Libreoffice-commits
mailing list